Merge pull request #897 from Spartan322/merge/b9437c3

Merge commit godotengine/godot@b9437c3
Redot-Engine · Dec 15, 2024 · e2a601f · e2a601f
2 parents 6f0eb78 + 9d47e1e
commit e2a601f
Show file tree

Hide file tree

Showing 1,031 changed files with 128,532 additions and 5,282 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,10 +2,6 @@
 # Each line is a file pattern followed by one or more owners.
 # Owners can be @users, @org/teams or emails.
 
-# Buildsystem (Before everything to be overwritten)
-
-*                                             @godotengine/buildsystem
-
 # Core
 
 /core/                                        @godotengine/core
@@ -20,8 +16,6 @@
 
 # Drivers
 
-/drivers/                                     @godotengine/_systems
-
 ## Audio
 /drivers/alsa/                                @godotengine/audio
 /drivers/alsamidi/                            @godotengine/audio
@@ -42,17 +36,17 @@
 /drivers/vulkan/                              @godotengine/rendering
 
 ## OS
-/drivers/unix/                                @godotengine/_platforms
+/drivers/unix/                                @godotengine/linux-bsd
 /drivers/windows/                             @godotengine/windows
 
 ## Misc
 /drivers/png/                                 @godotengine/import
 
 # Editor
 
-/editor/                                      @godotengine/_editor
 /editor/**/*2d*                               @godotengine/2d-editor
 /editor/**/*3d*                               @godotengine/3d-editor
+/editor/**/*audio*                            @godotengine/audio
 /editor/**/*code*                             @godotengine/script-editor
 /editor/**/*debugger*                         @godotengine/debugger
 /editor/**/*dock*                             @godotengine/docks
@@ -75,11 +69,6 @@
 
 # Modules
 
-/modules/                                     @godotengine/_engine
-/modules/**/doc_classes/                      @godotengine/_engine @godotengine/documentation
-/modules/**/icons/                            @godotengine/_engine @godotengine/usability
-/modules/**/tests/                            @godotengine/_engine @godotengine/tests
-
 ## Audio (+ video)
 /modules/interactive_music/                   @godotengine/audio
 /modules/interactive_music/doc_classes/       @godotengine/audio @godotengine/documentation
@@ -95,6 +84,7 @@
 ## Import
 /modules/astcenc/                             @godotengine/import
 /modules/basis_universal/                     @godotengine/import
+/modules/bcdec/                               @godotengine/import
 /modules/betsy/                               @godotengine/import
 /modules/bmp/                                 @godotengine/import
 /modules/cvtt/                                @godotengine/import
@@ -132,6 +122,7 @@
 ## Physics
 /modules/godot_physics_2d/                    @godotengine/physics
 /modules/godot_physics_3d/                    @godotengine/physics
+/modules/jolt_physics/                        @godotengine/physics
 
 ## Rendering
 /modules/glslang/                             @godotengine/rendering
@@ -190,7 +181,6 @@
 
 # Platform
 
-/platform/                                    @godotengine/_platforms
 /platform/android/                            @godotengine/android
 /platform/android/doc_classes/                @godotengine/android @godotengine/documentation
 /platform/ios/                                @godotengine/ios
@@ -206,7 +196,6 @@
 
 # Scene
 
-/scene/                                       @godotengine/_systems @godotengine/core
 /scene/2d/                                    @godotengine/2d-nodes
 /scene/2d/physics/                            @godotengine/2d-nodes @godotengine/physics
 /scene/3d/                                    @godotengine/3d-nodes
@@ -216,20 +205,23 @@
 /scene/debugger/                              @godotengine/debugger
 /scene/gui/                                   @godotengine/gui-nodes
 /scene/main/                                  @godotengine/core
-/scene/resources/font.*                       @godotengine/gui-nodes
-/scene/resources/text_line.*                  @godotengine/gui-nodes
-/scene/resources/text_paragraph.*             @godotengine/gui-nodes
-/scene/resources/visual_shader*.*             @godotengine/shaders
+/scene/resources/2d/                          @godotengine/2d-nodes
+/scene/resources/3d/                          @godotengine/3d-nodes
+/scene/resources/animated*                    @godotengine/animation
+/scene/resources/animation*                   @godotengine/animation
+/scene/resources/audio*                       @godotengine/audio
+/scene/resources/font*                        @godotengine/gui-nodes
+/scene/resources/shader*                      @godotengine/shaders
+/scene/resources/text_*                       @godotengine/gui-nodes
+/scene/resources/visual_shader*               @godotengine/shaders
 /scene/theme/                                 @godotengine/gui-nodes
 /scene/theme/icons/                           @godotengine/gui-nodes @godotengine/usability
 
 # Servers
 
-/servers/                                     @godotengine/_systems
 /servers/**/audio_*                           @godotengine/audio
 /servers/**/camera_*                          @godotengine/xr
 /servers/**/debugger_*                        @godotengine/debugger
-/servers/**/display_*                         @godotengine/_platforms
 /servers/**/navigation_*                      @godotengine/navigation
 /servers/**/physics_*                         @godotengine/physics
 /servers/**/rendering_*                       @godotengine/rendering
@@ -238,7 +230,6 @@
 /servers/audio/                               @godotengine/audio
 /servers/camera/                              @godotengine/xr
 /servers/debugger/                            @godotengine/debugger
-/servers/display/                             @godotengine/_platforms
 /servers/navigation/                          @godotengine/navigation
 /servers/rendering/                           @godotengine/rendering
 /servers/text/                                @godotengine/gui-nodes
@@ -254,6 +245,7 @@
 
 # Buildsystem (After everything to catch all)
 
+/*.*                                          @godotengine/buildsystem
 *.py                                          @godotengine/buildsystem
 SConstruct                                    @godotengine/buildsystem
 SCsub                                         @godotengine/buildsystem
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -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
@@ -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

diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
@@ -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

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -10,6 +10,7 @@ env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   TSAN_OPTIONS: suppressions=misc/error_suppressions/tsan.txt
+  UBSAN_OPTIONS: suppressions=misc/error_suppressions/ubsan.txt
 
 concurrency:
   group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-linux
@@ -35,6 +36,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
@@ -49,6 +51,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
@@ -61,6 +64,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
@@ -71,6 +75,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
@@ -80,6 +85,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
@@ -88,6 +94,7 @@ jobs:
             bin: ./bin/redot.linuxbsd.template_release.x86_64
             tests: true
             artifact: true
+            cache-limit: 1
 
     steps:
       - name: Checkout
@@ -140,6 +147,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
@@ -155,9 +163,6 @@ jobs:
       - name: Build .NET solutions
         if: matrix.build-mono
         run: |
-          # FIXME: C# warnings should be properly handled eventually, but we don't want to clutter
-          # the GitHub Actions annotations, so remove the associated problem matcher for now.
-          echo "::remove-matcher owner=msvc::"
           ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
 
       - name: Prepare artifact

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -25,13 +25,15 @@ jobs:
             target: editor
             tests: true
             bin: ./bin/redot.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/redot.macos.template_release.universal
+            cache-limit: 1
 
     steps:
       - name: Checkout
@@ -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
@@ -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

diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Class reference schema checks
         run: |
-          xmllint --noout --schema doc/class.xsd doc/classes/*.xml modules/*/doc_classes/*.xml platform/*/doc_classes/*.xml
+          xmllint --quiet --noout --schema doc/class.xsd doc/classes/*.xml modules/*/doc_classes/*.xml platform/*/doc_classes/*.xml
 
       - name: Run C compiler on `gdextension_interface.h`
         run: |

diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
@@ -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

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -31,6 +31,7 @@ jobs:
             sconsflags: debug_symbols=no vsproj=yes vsproj_gen_only=no windows_subsystem=console
             bin: ./bin/redot.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
@@ -39,6 +40,7 @@ jobs:
             sconsflags: debug_symbols=no windows_subsystem=console use_llvm=yes
             bin: ./bin/redot.windows.editor.x86_64.llvm.exe
             compiler: clang
+            cache-limit: 1
 
           - name: Template (target=template_release, tests=yes)
             cache-name: windows-template
@@ -47,6 +49,7 @@ jobs:
             sconsflags: debug_symbols=no
             bin: ./bin/redot.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
@@ -56,6 +59,7 @@ jobs:
             sconsflags: debug_symbols=no use_mingw=yes
             bin: ./bin/redot.windows.template_release.x86_64.console.exe
             compiler: gcc
+            cache-limit: 1
 
     steps:
       - name: Checkout
@@ -93,6 +97,7 @@ jobs:
           platform: windows
           target: ${{ matrix.target }}
           tests: ${{ matrix.tests }}
+          scons-cache-limit: ${{ matrix.cache-limit }}
 
       - name: Generate Glue Code
         if: ${{ matrix.cache-name == 'windows-editor-mono' }}

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -108,6 +108,13 @@ Copyright: 2007, Starbreeze Studios
  2007-2014, Juan Linietsky, Ariel Manzur
 License: Expat and Zlib
 
+Files: ./modules/jolt_physics/spaces/jolt_temp_allocator.cpp
+Comment: Jolt Physics
+Copyright: 2021, Jorrit Rouwe
+ 2014-present, Godot Engine contributors
+ 2007-2014, Juan Linietsky, Ariel Manzur
+License: Expat
+
 Files: ./modules/lightmapper_rd/lm_compute.glsl
 Comment: Joint Non-Local Means (JNLM) denoiser
 Copyright: 2020, Manuel Prandini
@@ -303,6 +310,11 @@ Comment: International Components for Unicode
 Copyright: 2016-2024, Unicode, Inc.
 License: Unicode
 
+Files: ./thirdparty/jolt_physics/
+Comment: Jolt Physics
+Copyright: 2021, Jorrit Rouwe
+License: Expat
+
 Files: ./thirdparty/jpeg-compressor/
 Comment: jpeg-compressor
 Copyright: 2012, Rich Geldreich