Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from godotengine:master #73

Merged
merged 30 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3669eb0
Added an "Edit Now" option to project dialog.
MajorMcDoom Aug 15, 2024
bb813ba
Fix Tree drag-and-drop scrolling having low FPS at low Physics Ticks …
Calinou Nov 2, 2024
daa665c
fix copy/paste error (fixes #99518)
Nov 22, 2024
344d678
[Buildsystem] Tweak cache sizes for CI
AThousandShips Nov 21, 2024
93e06ff
Fix select and edit invisble items in SubViewports
kitbdev Dec 2, 2024
0a61ebd
OpenXR: Add support for binding modifiers
BastiaanOlij Sep 18, 2024
ef3eecd
Optimize `String.count` and `String.countn` by avoiding repeated real…
Ivorforce Dec 11, 2024
76af953
Optimize `StringBuilder.as_string` by constructing the string in-plac…
Ivorforce Dec 12, 2024
f882727
Remove positional light mask from directional lights in Canvas Item s…
clayjohn Dec 12, 2024
63b9138
Fix 3D editor snap setting values not being displayed correctly
Uumutunal Dec 12, 2024
189c8eb
Implement shadowmasks for LightmapGI
BlueCube3310 Nov 30, 2023
9c34ad1
Add popup_create_dialog() for EditorInterface to create custom create…
Lazy-Rabbit-2001 Dec 12, 2024
0400cbc
Clean up ResourceImporterTexture
BlueCube3310 Oct 9, 2024
335077a
Image: More cleanup and reduced code duplication.
BlueCube3310 Oct 11, 2024
1bc70fe
Fix 3D ruler theme overrides
KoBeWi Dec 12, 2024
0994736
Merge pull request #100312 from KoBeWi/rule_out_ruler_warnings
akien-mga Dec 12, 2024
0e5c337
Merge pull request #85653 from BlueCube3310/lightmap-gi-shadowmask
akien-mga Dec 12, 2024
43ef253
Merge pull request #95600 from MajorMcDoom/project-dialog-optional-edit
akien-mga Dec 12, 2024
d1b683d
Merge pull request #97140 from BastiaanOlij/xr_action_map_enhancements
akien-mga Dec 12, 2024
abca831
Merge pull request #98071 from BlueCube3310/res-import-tex-clean
akien-mga Dec 12, 2024
1e1e862
Merge pull request #98100 from BlueCube3310/image-cleanup-more
akien-mga Dec 12, 2024
9d10e42
Merge pull request #98766 from Calinou/tree-drag-and-drop-use-process
akien-mga Dec 12, 2024
819db4d
Merge pull request #99559 from mayoff/OperatorEvaluatorModNZ-ptr_eval…
akien-mga Dec 12, 2024
82d51a3
Merge pull request #99709 from AThousandShips/cache_size_improve
akien-mga Dec 12, 2024
26fec37
Merge pull request #99942 from kitbdev/fix-invisible-subviewport-editor
akien-mga Dec 12, 2024
4cf1b0d
Merge pull request #100135 from Lazy-Rabbit-2001/expose-create-dialog…
akien-mga Dec 12, 2024
321bd35
Merge pull request #100294 from Ivorforce/count-no-realloc
akien-mga Dec 12, 2024
7b15c06
Merge pull request #100295 from Ivorforce/string-builder-inplace
akien-mga Dec 12, 2024
562dd1a
Merge pull request #100305 from clayjohn/directional-light-2d-mask
akien-mga Dec 12, 2024
19e003b
Merge pull request #100306 from Uumutunal/master
akien-mga Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,21 @@ jobs:
target: editor
tests: false
sconsflags: arch=arm64 production=yes swappy=yes
cache-limit: 1

- name: Template arm32 (target=template_release, arch=arm32)
cache-name: android-template-arm32
target: template_release
tests: false
sconsflags: arch=arm32 swappy=yes
cache-limit: 1

- name: Template arm64 (target=template_release, arch=arm64)
cache-name: android-template-arm64
target: template_release
tests: false
sconsflags: arch=arm64 swappy=yes
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -77,6 +80,7 @@ jobs:
platform: android
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
platform: ios
target: template_release
tests: false
scons-cache-limit: 1

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
proj-conv: true
api-compat: true
artifact: true
cache-limit: 1

- name: Editor with doubles and GCC sanitizers (target=editor, tests=yes, dev_build=yes, scu_build=yes, precision=double, use_asan=yes, use_ubsan=yes, linker=gold)
cache-name: linux-editor-double-sanitizers
Expand All @@ -49,6 +50,7 @@ jobs:
api-dump: true
# Skip 2GiB artifact speeding up action.
artifact: false
cache-limit: 7

- name: Editor with clang sanitizers (target=editor, tests=yes, dev_build=yes, use_asan=yes, use_ubsan=yes, use_llvm=yes, linker=lld)
cache-name: linux-editor-llvm-sanitizers
Expand All @@ -61,6 +63,7 @@ jobs:
artifact: false
# Test our oldest supported SCons/Python versions on one arbitrary editor build.
legacy-scons: true
cache-limit: 7

- name: Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld)
cache-name: linux-editor-thread-sanitizer
Expand All @@ -71,6 +74,7 @@ jobs:
build-mono: false
# Skip 2GiB artifact speeding up action.
artifact: false
cache-limit: 5

- name: Template w/ Mono (target=template_release, tests=yes)
cache-name: linux-template-mono
Expand All @@ -80,6 +84,7 @@ jobs:
build-mono: false
tests: true
artifact: true
cache-limit: 1

- name: Minimal template (target=template_release, tests=yes, everything disabled)
cache-name: linux-template-minimal
Expand All @@ -88,6 +93,7 @@ jobs:
bin: ./bin/godot.linuxbsd.template_release.x86_64
tests: true
artifact: true
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -140,6 +146,7 @@ jobs:
platform: linuxbsd
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ jobs:
target: editor
tests: true
bin: ./bin/godot.macos.editor.universal
cache-limit: 1

- name: Template (target=template_release, tests=yes)
cache-name: macos-template
target: template_release
tests: true
sconsflags: debug_symbols=no
bin: ./bin/godot.macos.template_release.universal
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -59,6 +61,7 @@ jobs:
platform: macos
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: 0 # Only cap on second run to avoid purging unnecessarily

- name: Compilation (arm64)
uses: ./.github/actions/godot-build
Expand All @@ -67,6 +70,7 @@ jobs:
platform: macos
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/web_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
platform: web
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: 0.5

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
sconsflags: debug_symbols=no vsproj=yes vsproj_gen_only=no windows_subsystem=console
bin: ./bin/godot.windows.editor.x86_64.exe
compiler: msvc
cache-limit: 2

- name: Editor w/ clang-cl (target=editor, tests=yes, use_llvm=yes)
cache-name: windows-editor-clang
Expand All @@ -39,6 +40,7 @@ jobs:
sconsflags: debug_symbols=no windows_subsystem=console use_llvm=yes
bin: ./bin/godot.windows.editor.x86_64.llvm.exe
compiler: clang
cache-limit: 1

- name: Template (target=template_release, tests=yes)
cache-name: windows-template
Expand All @@ -47,6 +49,7 @@ jobs:
sconsflags: debug_symbols=no
bin: ./bin/godot.windows.template_release.x86_64.console.exe
compiler: msvc
cache-limit: 2

- name: Template w/ GCC (target=template_release, tests=yes, use_mingw=yes)
cache-name: windows-template-gcc
Expand All @@ -56,6 +59,7 @@ jobs:
sconsflags: debug_symbols=no use_mingw=yes
bin: ./bin/godot.windows.template_release.x86_64.console.exe
compiler: gcc
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -93,6 +97,7 @@ jobs:
platform: windows
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
Loading
Loading