Merge tag '4.7-stable' into work2

Author: MystMagus

.clang-format

@@ -1,3 +1,6 @@
+# If you change this file, please format all files of the codebase as part of your PR:
+# 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
 # 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
@@ -114,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,21 +1,26 @@
+# If you change this file, please format all files of the codebase as part of your PR:
+# prek run --hook-stage manual clang-tidy --all
+
 Checks:
   - -*
-  - cppcoreguidelines-pro-type-member-init
+  - performance-move-const-arg
+  - 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: "&&;&=;&;|;~;!;!=;||;|=;^;^="

.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: "*"

.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

@@ -40,7 +40,8 @@
 /drivers/vulkan/                              @godotengine/rendering
 
 ## OS
-/drivers/apple*/                              @godotengine/macos
+/drivers/apple/                               @godotengine/macos @godotengine/ios
+/drivers/apple_embedded/                      @godotengine/ios
 /drivers/unix/                                @godotengine/linux-bsd
 /drivers/windows/                             @godotengine/windows
 
@@ -113,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
@@ -147,6 +147,10 @@
 /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
@@ -158,7 +162,7 @@
 /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/editor/                         @godotengine/dotnet @godotengine/editor
 
 ## Text
 /modules/freetype/                            @godotengine/buildsystem
@@ -187,6 +191,7 @@
 /modules/gridmap/                             @godotengine/3d-nodes
 /modules/gridmap/doc_classes/                 @godotengine/3d-nodes @godotengine/documentation
 /modules/gridmap/editor/                      @godotengine/3d-nodes @godotengine/editor
+/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
@@ -252,7 +257,6 @@
 /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
 
 # Servers

.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/guidelines/code_style.html
+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-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

@@ -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