Merge branch 'godotengine:master' into master

Author: VewDev

.clang-format

@@ -1,5 +1,5 @@
 # If you change this file, please format all files of the codebase as part of your PR:
-# pre-commit run clang-format --all
+# prek 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
@@ -117,14 +117,25 @@ Cpp11BracedListStyle: false
 #   - BOOST_FOREACH
 # IfMacros:
 #   - KJ_IF_MAYBE
-# IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: ^".*"$
-    Priority: 1
-  - Regex: ^<.*\.h>$
-    Priority: 2
+  - Regex: ^"(core|drivers|editor|main|scene|servers|tests)/.*"$
+    Priority: 20
+  - Regex: ^"(modules|platform)/.*"$
+    Priority: 30
+  - Regex: ^<thirdparty/.*>$
+    Priority: 40
+  - Regex: ^<(windows|Jolt/Jolt|platform_gl)\.h>$
+    Priority: 50
+  - Regex: ^<.*\.(h|hpp)>$
+    Priority: 60
   - Regex: ^<.*>$
-    Priority: 3
+    Priority: 70
+  - Regex: ^".*\.compat\.inc"$
+    Priority: 0
+    SortPriority: 1
+  - Regex: ^".*"$
+    Priority: 10
 # IncludeIsMainRegex: (Test)?$
 # IncludeIsMainSourceRegex: ""
 # IndentAccessModifiers: false

.clang-tidy

@@ -1,8 +1,9 @@
 # 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
+# prek run --hook-stage manual clang-tidy --all
 
 Checks:
   - -*
+  - performance-move-const-arg
   - bugprone-use-after-move
   - modernize-deprecated-headers
   - modernize-redundant-void-arg

.clangd

@@ -1,12 +1,21 @@
 # https://clangd.llvm.org/config
+
 ---
+
 # Default conditions, apply everywhere.
 
+CompileFlags:
+  Add:
+    # Some thirdparty includes seem to require a high -ferror-limit to pass checks.
+    - -ferror-limit=100
+
 Diagnostics:
   Includes:
     IgnoreHeader:
       - \.compat\.inc
+
 ---
+
 # Header-specific conditions.
 
 If:
@@ -20,11 +29,19 @@ CompileFlags:
     - -Wno-unused-const-variable
     - -Wno-unused-function
     - -Wno-unused-variable
+
 ---
-# Suppress all third-party warnings.
+
+# Suppress warnings for third-party or partial code.
 
 If:
-  PathMatch: thirdparty/.*
+  PathMatch:
+    - bin/build_deps/.*
+    - misc/dist/apple_embedded_xcode/.*
+    - tests/compatibility_test/.*
+    - thirdparty/.*
+    - .*/thirdparty/.*
+    - .*-so_wrap.[ch]
 
 Diagnostics:
   Suppress: "*"

.github/CODEOWNERS

@@ -40,10 +40,14 @@
 /drivers/vulkan/                              @godotengine/rendering
 
 ## OS
+/drivers/apple/                               @godotengine/macos @godotengine/ios
+/drivers/apple_embedded/                      @godotengine/ios
 /drivers/unix/                                @godotengine/linux-bsd
 /drivers/windows/                             @godotengine/windows
 
 ## Misc
+/drivers/register_driver_types.*              @godotengine/buildsystem
+/drivers/accesskit/                           @godotengine/buildsystem
 /drivers/png/                                 @godotengine/asset-pipeline
 
 # Editor
@@ -54,7 +58,6 @@
 /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
@@ -111,7 +114,6 @@
 /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
@@ -125,7 +127,6 @@
 /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
@@ -146,20 +147,22 @@
 /modules/meshoptimizer/                       @godotengine/rendering
 /modules/raycast/                             @godotengine/rendering
 /modules/vhacd/                               @godotengine/rendering
+/modules/visual_shader/                       @godotengine/shaders
+/modules/visual_shader/doc_classes/           @godotengine/shaders @godotengine/documentation
+/modules/visual_shader/editor/                @godotengine/shaders @godotengine/editor
+/modules/visual_shader/tests/                 @godotengine/shaders @godotengine/tests
 /modules/xatlas_unwrap/                       @godotengine/rendering
 
 ## Scripting
 /modules/gdscript/                            @godotengine/gdscript
 /modules/gdscript/doc_classes/                @godotengine/gdscript @godotengine/documentation
 /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/editor/                         @godotengine/dotnet @godotengine/script-editor
-/modules/mono/icons/                          @godotengine/dotnet
+/modules/mono/editor/                         @godotengine/dotnet @godotengine/editor
 
 ## Text
 /modules/freetype/                            @godotengine/buildsystem
@@ -180,36 +183,35 @@
 /modules/webxr/doc_classes/                   @godotengine/xr @godotengine/documentation
 
 ## Misc
+/modules/register_module_types.*              @godotengine/buildsystem
 /modules/csg/                                 @godotengine/3d-nodes
 /modules/csg/doc_classes/                     @godotengine/3d-nodes @godotengine/documentation
 /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/editor/                      @godotengine/3d-nodes @godotengine/editor
-/modules/gridmap/icons/                       @godotengine/3d-nodes
+/modules/gridmap/tests/                       @godotengine/3d-nodes @godotengine/tests
 /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/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
 /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
 
 # Platform
 
+/platform/register_platform_apis.*            @godotengine/buildsystem
 /platform/android/                            @godotengine/android
 /platform/android/doc_classes/                @godotengine/android @godotengine/documentation
 /platform/ios/                                @godotengine/ios
@@ -218,13 +220,18 @@
 /platform/linuxbsd/doc_classes/               @godotengine/linux-bsd @godotengine/documentation
 /platform/macos/                              @godotengine/macos
 /platform/macos/doc_classes/                  @godotengine/macos @godotengine/documentation
+/platform/visionos/                           @godotengine/xr
+/platform/visionos/doc_classes/               @godotengine/xr @godotengine/documentation
 /platform/web/                                @godotengine/web
 /platform/web/doc_classes/                    @godotengine/web @godotengine/documentation
 /platform/windows/                            @godotengine/windows
 /platform/windows/doc_classes/                @godotengine/windows @godotengine/documentation
 
 # Scene
 
+/scene/property_*                             @godotengine/buildsystem
+/scene/register_scene_types.*                 @godotengine/buildsystem
+/scene/scene_string_names.*                   @godotengine/buildsystem
 /scene/2d/                                    @godotengine/2d-nodes
 /scene/2d/navigation/                         @godotengine/2d-nodes @godotengine/navigation
 /scene/2d/physics/                            @godotengine/2d-nodes @godotengine/physics
@@ -237,24 +244,31 @@
 /scene/debugger/                              @godotengine/debugger
 /scene/gui/                                   @godotengine/gui-nodes
 /scene/main/                                  @godotengine/core
+/scene/resources/*                            @godotengine/gui-nodes
 /scene/resources/2d/                          @godotengine/2d-nodes
 /scene/resources/2d/skeleton/                 @godotengine/2d-nodes @godotengine/animation
 /scene/resources/3d/                          @godotengine/3d-nodes
 /scene/resources/animated*                    @godotengine/animation
 /scene/resources/animation*                   @godotengine/animation
 /scene/resources/audio*                       @godotengine/audio
+/scene/resources/bone*                        @godotengine/animation
 /scene/resources/font*                        @godotengine/gui-nodes
+/scene/resources/physics*                     @godotengine/physics
 /scene/resources/shader*                      @godotengine/shaders
+/scene/resources/skeleton*                    @godotengine/animation
 /scene/resources/text_*                       @godotengine/gui-nodes
-/scene/resources/visual_shader*               @godotengine/shaders
 /scene/theme/                                 @godotengine/gui-nodes
-/scene/theme/icons/                           @godotengine/gui-nodes
 
 # Servers
 
+/servers/nav_heap.*                           @godotengine/navigation
+/servers/register_server_types.*              @godotengine/buildsystem
+/servers/server_wrap_*                        @godotengine/buildsystem
 /servers/audio/                               @godotengine/audio
 /servers/camera/                              @godotengine/xr
 /servers/debugger/                            @godotengine/debugger
+/servers/display/                             @godotengine/rendering
+/servers/movie_writer/                        @godotengine/rendering
 /servers/navigation_2d/                       @godotengine/navigation
 /servers/navigation_3d/                       @godotengine/navigation
 /servers/physics_2d/                          @godotengine/physics

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,18 @@
 <!--
-Please target the `master` branch in priority.
+Please target the `master` branch. We will take care of backporting relevant fixes to older versions.
 
-Relevant fixes are cherry-picked for stable branches as needed by maintainers.
+Before submitting, please read our checklist for contributors:
+https://contributing.godotengine.org/en/latest/engine/introduction.html#checklist-for-new-contributors
 
-To speed up the contribution process and avoid CI errors, please set up pre-commit hooks locally:
-https://contributing.godotengine.org/en/latest/engine/introduction.html#setting-up-a-dev-environment
+Use of AI must be disclosed and should include a description of how it was used.
+-->
+
+## What problem(s) does this PR solve?
+
+- Closes #
+
+## Additional information
+
+<!--
+Provide additional information and explanation of your PR, including areas that you are uncertain of or require special attention from reviewers. For examples, please read our pull request guidelines: https://contributing.godotengine.org/en/latest/pull_requests/pull_request_guidelines.html#explain-your-contributions
 -->

.github/actions/clangd-tidy/action.yml

@@ -0,0 +1,30 @@
+name: clangd-tidy
+description: Setup and run clangd-tidy on relevant files
+
+inputs:
+  changed-files:
+    description: A pre-filtered list of changed files.
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Setup clangd-tidy
+      shell: sh
+      run: |
+        echo "::group::Prerequisite checks"
+        if [ ! -f "compile_commands.json" ]; then
+          echo "::error::clangd-tidy checker requires a compilation database to function"
+          exit 1
+        fi
+        echo "::endgroup::"
+
+        echo "::group::Installing clangd-tidy"
+        # Don't know which python we're using, so just access the global scope.
+        python -m pip install clangd clangd-tidy clang-tidy==22.1.0
+        echo "::endgroup::"
+
+        echo "::group::Running clangd-tidy"
+        clangd-tidy ${{ inputs.changed-files }}
+        echo "::endgroup::"

.github/actions/download-artifact/action.yml

@@ -14,7 +14,7 @@ runs:
   using: composite
   steps:
     - name: Download Godot Artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: ${{ inputs.name }}
         path: ${{ inputs.path }}

.github/actions/godot-cache-restore/action.yml

@@ -12,7 +12,7 @@ runs:
   using: composite
   steps:
     - name: Restore default cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       id: cache-ping
       with:
         path: ${{ inputs.scons-cache }}
@@ -27,7 +27,7 @@ runs:
     # This is done after pulling the default cache so that PRs can integrate any potential changes
     # from the default branch without conflicting with whatever local changes were already made.
     - name: Restore local cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       if: github.ref_name != github.event.repository.default_branch
       with:
         path: ${{ inputs.scons-cache }}

.github/actions/godot-cache-save/action.yml

@@ -16,7 +16,7 @@ runs:
       run: misc/scripts/purge_cache.py ${{ env.CACHE_TIMESTAMP }} "${{ inputs.scons-cache }}"
 
     - name: Save SCons cache directory
-      uses: actions/cache/save@v4
+      uses: actions/cache/save@v5
       with:
         path: ${{ inputs.scons-cache }}
         key: ${{ inputs.cache-name }}|${{ github.ref_name }}|${{ github.sha }}

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

@@ -22,7 +22,7 @@ runs:
   using: composite
   steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: recursive
         repository: godotengine/godot-cpp