Merge branch 'godotengine:master' into streaming-texture

Author: LizzyTB

.clang-format

@@ -1,3 +1,6 @@
+# If you change this file, please format all files of the codebase as part of your PR:
+# pre-commit run clang-format --all
+
 # Commented out parameters are those with the same value as base LLVM style.
 # We can uncomment them if we want to change their value, or enforce the
 # chosen value in case the base style changes (last sync: Clang 18.1.8).
@@ -38,7 +41,7 @@ AlignAfterOpenBracket: DontAlign
 #   AcrossEmptyLines: false
 #   AcrossComments: false
 #   AlignCaseColons: false
-# AlignEscapedNewlines: Right
+AlignEscapedNewlines: DontAlign # Aligning leads to long diffs
 AlignOperands: DontAlign
 AlignTrailingComments:
   Kind: Never

.clang-tidy

@@ -1,21 +1,25 @@
+# If you change this file, please format all files of the codebase as part of your PR:
+# pre-commit run --hook-stage manual clang-tidy --all
+
 Checks:
   - -*
-  - cppcoreguidelines-pro-type-member-init
+  - bugprone-use-after-move
   - modernize-deprecated-headers
   - modernize-redundant-void-arg
   - modernize-use-bool-literals
-  - modernize-use-default-member-init
+#  - modernize-use-default-member-init # TODO Re-activate
   - modernize-use-nullptr
   - readability-braces-around-statements
   - readability-redundant-member-init
+  - readability-operators-representation
 HeaderFileExtensions: ["", h, hh, hpp, hxx, inc, glsl]
 ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
 HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
 FormatStyle: file
 CheckOptions:
-  cppcoreguidelines-pro-type-member-init.IgnoreArrays: true
-  cppcoreguidelines-pro-type-member-init.UseAssignment: true
   modernize-deprecated-headers.CheckHeaderFile: true
   modernize-use-bool-literals.IgnoreMacros: false
   modernize-use-default-member-init.IgnoreMacros: false
   modernize-use-default-member-init.UseAssignment: true
+  readability-operators-representation.BinaryOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="
+  readability-operators-representation.OverloadedOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="

.git-blame-ignore-revs

@@ -72,3 +72,18 @@ e06d83860d798b6766b23d6eae48557387a7db85
 
 # Style: Replace header guards with `#pragma once`
 324512e11c1b7663c3cf47bec6ddbe65c6b8db2b
+
+# Style: Don't right-align escaped newlines
+c5df0cb82bc539eff7dcfb2add99d60771fc50c5
+
+# Style: Convert `*.gen.inc` to `*.gen.h`
+7dae5da1982f4a55ba91557814905faef9ce461b
+
+# Move RenderingServer enums to a dedicated RenderingServerEnums (`RSE`) namespace
+f5a290ac462765afca34e64dd39f883511510147
+
+# Style: Add `class_db.h` includes explicitly
+e380a417526c11f15a9ddb3997292409b10da2af
+
+# Move DisplayServer enums and typedefs to DisplayServerEnums
+a447ac95ec170ee117c2eae55f1bfff0d0cf0dce

.github/CODEOWNERS

@@ -13,6 +13,7 @@
 # Doc
 
 /doc/                                         @godotengine/documentation
+/doc/translations/                            @godotengine/i18n
 
 # Drivers
 
@@ -26,6 +27,9 @@
 /drivers/winmidi/                             @godotengine/audio
 /drivers/xaudio2/                             @godotengine/audio
 
+## Input
+/drivers/sdl/                                 @godotengine/input
+
 ## Rendering
 /drivers/d3d12/                               @godotengine/rendering
 /drivers/dummy/                               @godotengine/rendering
@@ -40,29 +44,27 @@
 /drivers/windows/                             @godotengine/windows
 
 ## Misc
-/drivers/png/                                 @godotengine/import
+/drivers/png/                                 @godotengine/asset-pipeline
 
 # Editor
 
-/editor/                                      @godotengine/docks
-/editor/animation/                            @godotengine/animation
-/editor/audio/                                @godotengine/audio
-/editor/debugger/                             @godotengine/debugger
-/editor/doc/                                  @godotengine/documentation
-/editor/docks/                                @godotengine/docks
-/editor/gui/                                  @godotengine/usability @godotengine/gui-nodes
-/editor/icons/                                @godotengine/usability
-/editor/import/                               @godotengine/import
-/editor/inspector/                            @godotengine/docks
-/editor/scene/2d/                             @godotengine/2d-editor
-/editor/scene/2d/physics/                     @godotengine/2d-editor @godotengine/physics
-/editor/scene/3d/                             @godotengine/3d-editor
-/editor/scene/3d/physics/                     @godotengine/3d-editor @godotengine/physics
-/editor/scene/gui/                            @godotengine/gui-nodes
-/editor/script/                               @godotengine/script-editor
-/editor/shader/                               @godotengine/script-editor @godotengine/shaders
-/editor/themes/                               @godotengine/usability @godotengine/gui-nodes
-/editor/translations/                         @godotengine/usability
+/editor/                                      @godotengine/editor
+/editor/animation/                            @godotengine/editor @godotengine/animation
+/editor/audio/                                @godotengine/editor @godotengine/audio
+/editor/debugger/                             @godotengine/editor @godotengine/debugger
+/editor/doc/                                  @godotengine/editor @godotengine/documentation
+/editor/gui/                                  @godotengine/editor @godotengine/gui-nodes
+/editor/icons/                                @godotengine/editor
+/editor/import/                               @godotengine/editor @godotengine/asset-pipeline
+/editor/scene/2d/                             @godotengine/editor @godotengine/2d-nodes
+/editor/scene/2d/physics/                     @godotengine/editor @godotengine/physics
+/editor/scene/3d/                             @godotengine/editor @godotengine/3d-nodes
+/editor/scene/3d/physics/                     @godotengine/editor @godotengine/physics
+/editor/scene/gui/                            @godotengine/editor @godotengine/gui-nodes
+/editor/script/                               @godotengine/editor @godotengine/script-editor
+/editor/shader/                               @godotengine/editor @godotengine/script-editor @godotengine/shaders
+/editor/themes/                               @godotengine/editor @godotengine/gui-nodes
+/editor/translations/                         @godotengine/i18n
 
 # Main
 
@@ -78,37 +80,42 @@
 ## Audio (+ video)
 /modules/interactive_music/                   @godotengine/audio
 /modules/interactive_music/doc_classes/       @godotengine/audio @godotengine/documentation
+/modules/interactive_music/editor/            @godotengine/audio @godotengine/editor
 /modules/mp3/                                 @godotengine/audio
 /modules/mp3/doc_classes/                     @godotengine/audio @godotengine/documentation
 /modules/ogg/                                 @godotengine/audio
 /modules/ogg/doc_classes/                     @godotengine/audio @godotengine/documentation
 /modules/theora/                              @godotengine/audio
 /modules/theora/doc_classes/                  @godotengine/audio @godotengine/documentation
+/modules/theora/editor/                       @godotengine/audio @godotengine/editor
 /modules/vorbis/                              @godotengine/audio
 /modules/vorbis/doc_classes/                  @godotengine/audio @godotengine/documentation
 
 ## 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
-/modules/dds/                                 @godotengine/import
-/modules/etcpak/                              @godotengine/import
-/modules/fbx/                                 @godotengine/import
-/modules/fbx/doc_classes/                     @godotengine/import @godotengine/documentation
-/modules/gltf/                                @godotengine/import
-/modules/gltf/doc_classes/                    @godotengine/import @godotengine/documentation
-/modules/gltf/tests/                          @godotengine/import @godotengine/tests
-/modules/hdr/                                 @godotengine/import
-/modules/jpg/                                 @godotengine/import
-/modules/ktx/                                 @godotengine/import
-/modules/squish/                              @godotengine/import
-/modules/svg/                                 @godotengine/import
-/modules/tga/                                 @godotengine/import
-/modules/tinyexr/                             @godotengine/import
-/modules/webp/                                @godotengine/import
+/modules/astcenc/                             @godotengine/asset-pipeline
+/modules/basis_universal/                     @godotengine/asset-pipeline
+/modules/bcdec/                               @godotengine/asset-pipeline
+/modules/betsy/                               @godotengine/asset-pipeline
+/modules/bmp/                                 @godotengine/asset-pipeline
+/modules/cvtt/                                @godotengine/asset-pipeline
+/modules/dds/                                 @godotengine/asset-pipeline
+/modules/dds/tests/                           @godotengine/asset-pipeline @godotengine/tests
+/modules/etcpak/                              @godotengine/asset-pipeline
+/modules/fbx/                                 @godotengine/asset-pipeline
+/modules/fbx/doc_classes/                     @godotengine/asset-pipeline @godotengine/documentation
+/modules/fbx/editor/                          @godotengine/asset-pipeline @godotengine/editor
+/modules/gltf/                                @godotengine/asset-pipeline
+/modules/gltf/doc_classes/                    @godotengine/asset-pipeline @godotengine/documentation
+/modules/gltf/editor/                         @godotengine/asset-pipeline @godotengine/editor
+/modules/gltf/tests/                          @godotengine/asset-pipeline @godotengine/tests
+/modules/hdr/                                 @godotengine/asset-pipeline
+/modules/jpg/                                 @godotengine/asset-pipeline
+/modules/ktx/                                 @godotengine/asset-pipeline
+/modules/squish/                              @godotengine/asset-pipeline
+/modules/svg/                                 @godotengine/asset-pipeline
+/modules/tga/                                 @godotengine/asset-pipeline
+/modules/tinyexr/                             @godotengine/asset-pipeline
+/modules/webp/                                @godotengine/asset-pipeline
 
 ## Network
 /modules/enet/                                @godotengine/network
@@ -117,18 +124,21 @@
 /modules/mbedtls/tests/                       @godotengine/network @godotengine/tests
 /modules/multiplayer/                         @godotengine/network
 /modules/multiplayer/doc_classes/             @godotengine/network @godotengine/documentation
+/modules/multiplayer/editor/                  @godotengine/network @godotengine/editor
+/modules/multiplayer/icons/                   @godotengine/network
 /modules/multiplayer/tests/                   @godotengine/network @godotengine/tests
 /modules/upnp/                                @godotengine/network
 /modules/upnp/doc_classes/                    @godotengine/network @godotengine/documentation
 /modules/webrtc/                              @godotengine/network
 /modules/webrtc/doc_classes/                  @godotengine/network @godotengine/documentation
 /modules/websocket/                           @godotengine/network
 /modules/websocket/doc_classes/               @godotengine/network @godotengine/documentation
+/modules/websocket/editor/                    @godotengine/network @godotengine/editor
 
 ## Physics
 /modules/godot_physics_2d/                    @godotengine/physics
 /modules/godot_physics_3d/                    @godotengine/physics
-/modules/jolt_physics/                        @godotengine/physics
+/modules/jolt_physics/                        @godotengine/physics @godotengine/jolt-physics
 
 ## Rendering
 /modules/glslang/                             @godotengine/rendering
@@ -141,13 +151,15 @@
 ## Scripting
 /modules/gdscript/                            @godotengine/gdscript
 /modules/gdscript/doc_classes/                @godotengine/gdscript @godotengine/documentation
-/modules/gdscript/icons/                      @godotengine/gdscript @godotengine/usability
+/modules/gdscript/editor/                     @godotengine/gdscript @godotengine/script-editor
+/modules/gdscript/icons/                      @godotengine/gdscript
 /modules/gdscript/tests/                      @godotengine/gdscript @godotengine/tests
 /modules/jsonrpc/                             @godotengine/gdscript @godotengine/network
 /modules/jsonrpc/tests/                       @godotengine/gdscript @godotengine/network @godotengine/tests
 /modules/mono/                                @godotengine/dotnet
 /modules/mono/doc_classes/                    @godotengine/dotnet @godotengine/documentation
-/modules/mono/icons/                          @godotengine/dotnet @godotengine/usability
+/modules/mono/editor/                         @godotengine/dotnet @godotengine/script-editor
+/modules/mono/icons/                          @godotengine/dotnet
 
 ## Text
 /modules/freetype/                            @godotengine/buildsystem
@@ -163,29 +175,38 @@
 /modules/mobile_vr/doc_classes/               @godotengine/xr @godotengine/documentation
 /modules/openxr/                              @godotengine/xr
 /modules/openxr/doc_classes/                  @godotengine/xr @godotengine/documentation
+/modules/openxr/editor/                       @godotengine/xr @godotengine/editor
 /modules/webxr/                               @godotengine/xr
 /modules/webxr/doc_classes/                   @godotengine/xr @godotengine/documentation
 
 ## Misc
 /modules/csg/                                 @godotengine/3d-nodes
 /modules/csg/doc_classes/                     @godotengine/3d-nodes @godotengine/documentation
-/modules/csg/icons/                           @godotengine/3d-nodes @godotengine/usability
+/modules/csg/editor/                          @godotengine/3d-nodes @godotengine/editor
+/modules/csg/icons/                           @godotengine/3d-nodes
+/modules/csg/tests/                           @godotengine/3d-nodes @godotengine/tests
 /modules/gridmap/                             @godotengine/3d-nodes
 /modules/gridmap/doc_classes/                 @godotengine/3d-nodes @godotengine/documentation
-/modules/gridmap/icons/                       @godotengine/3d-nodes @godotengine/usability
+/modules/gridmap/editor/                      @godotengine/3d-nodes @godotengine/editor
+/modules/gridmap/icons/                       @godotengine/3d-nodes
 /modules/navigation_2d/                       @godotengine/navigation
+/modules/navigation_2d/editor/                @godotengine/navigation @godotengine/editor
 /modules/navigation_3d/                       @godotengine/navigation
+/modules/navigation_3d/editor/                @godotengine/navigation @godotengine/editor
 /modules/noise/                               @godotengine/core
 /modules/noise/doc_classes/                   @godotengine/core @godotengine/documentation
-/modules/noise/icons/                         @godotengine/core @godotengine/usability
+/modules/noise/editor/                        @godotengine/core @godotengine/editor
+/modules/noise/icons/                         @godotengine/core
 /modules/noise/tests/                         @godotengine/core @godotengine/tests
+/modules/objectdb_profiler/                   @godotengine/debugger
+/modules/objectdb_profiler/editor/            @godotengine/debugger @godotengine/editor
 /modules/regex/                               @godotengine/core
 /modules/regex/doc_classes/                   @godotengine/core @godotengine/documentation
-/modules/regex/icons/                         @godotengine/core @godotengine/usability
+/modules/regex/icons/                         @godotengine/core
 /modules/regex/tests/                         @godotengine/core @godotengine/tests
 /modules/zip/                                 @godotengine/core
 /modules/zip/doc_classes/                     @godotengine/core @godotengine/documentation
-/modules/zip/tests                            @godotengine/core @godotengine/tests
+/modules/zip/tests/                           @godotengine/core @godotengine/tests
 
 # Platform
 
@@ -227,7 +248,7 @@
 /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
+/scene/theme/icons/                           @godotengine/gui-nodes
 
 # Servers
 
@@ -249,6 +270,7 @@
 # Thirdparty
 
 /thirdparty/                                  @godotengine/buildsystem
+/thirdparty/jolt_physics/                     @godotengine/buildsystem @godotengine/jolt-physics
 
 # Buildsystem (After everything to catch all)
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,5 +4,5 @@ Please target the `master` branch in priority.
 Relevant fixes are cherry-picked for stable branches as needed by maintainers.
 
 To speed up the contribution process and avoid CI errors, please set up pre-commit hooks locally:
-https://contributing.godotengine.org/en/latest/engine/guidelines/code_style.html
+https://contributing.godotengine.org/en/latest/engine/introduction.html#setting-up-a-dev-environment
 -->

.github/actions/godot-compat-test/action.yml

@@ -0,0 +1,33 @@
+name: Godot hash compatibility test
+description: Check if methods with given hashes used by the older GDExtensions still can be loaded with given Godot version.
+
+inputs:
+  bin:
+    description: Path to the Godot binary.
+    required: true
+    type: string
+  reftags:
+    description: Reference tags of Godot versions to check (comma separated).
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Extract GDExtension interface
+      shell: sh
+      run: |
+        ${{ inputs.bin }} --headless --dump-gdextension-interface
+        mkdir tests/compatibility_test/src/deps/
+        mv gdextension_interface.h tests/compatibility_test/src/deps/
+
+    - name: Build minimal GDExtension
+      shell: sh
+      run: scons --directory=./tests/compatibility_test
+
+    - name: Download reference GDExtension API JSON and try to load it
+      shell: sh
+      env:
+        GODOT4_BIN: ${{ inputs.bin }}
+        REFTAGS: ${{ inputs.reftags }}
+      run: ./tests/compatibility_test/run_compatibility_test.py

.github/actions/godot-cpp-build/action.yml

@@ -35,4 +35,6 @@ runs:
 
     - name: SCons Build
       shell: sh
+      env:
+        SCONS_CACHE: ${{ inputs.scons-cache }}
       run: scons --directory=./godot-cpp/test "gdextension_dir=${{ github.workspace }}" ${{ inputs.scons-flags }}