Merge branch 'master' of github.com:voidiii/godot

Author: voidiii

.clang-format

@@ -52,8 +52,10 @@ AllowShortFunctionsOnASingleLine: Inline
 # AlwaysBreakAfterReturnType: None
 # AlwaysBreakBeforeMultilineStrings: false
 # AlwaysBreakTemplateDeclarations: MultiLine
-# AttributeMacros:
-#   - __capability
+AttributeMacros:
+  - _ALWAYS_INLINE_
+  - _FORCE_INLINE_
+  - _NO_INLINE_
 # BinPackArguments: true
 # BinPackParameters: true
 # BitFieldColonSpacing: Both

.clang-tidy

@@ -1,6 +1,7 @@
 Checks:
   - -*
   - cppcoreguidelines-pro-type-member-init
+  - modernize-deprecated-headers
   - modernize-redundant-void-arg
   - modernize-use-bool-literals
   - modernize-use-default-member-init
@@ -14,6 +15,7 @@ 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

.clangd

@@ -5,7 +5,6 @@
 Diagnostics:
   Includes:
     IgnoreHeader:
-      - core/typedefs\.h # Our "main" header, featuring transitive includes; allow everywhere.
       - \.compat\.inc
 ---
 # Header-specific conditions.

.editorconfig

@@ -16,5 +16,6 @@ indent_style = space
 indent_size = 2
 indent_style = space
 
-[*.svg]
-insert_final_newline = false
+[{*.props,*.vcxproj}]
+indent_size = 2
+indent_style = space

.git-blame-ignore-revs

@@ -66,3 +66,9 @@ bb5f390fb9b466be35a5df7651323d7e66afca31
 
 # Style: Enforce `AllowShortFunctionsOnASingleLine`
 e06d83860d798b6766b23d6eae48557387a7db85
+
+# Style: Enforce trailing newlines on svgs
+7e5baa042639ffa835271703c720e2595e90afb8
+
+# Style: Replace header guards with `#pragma once`
+324512e11c1b7663c3cf47bec6ddbe65c6b8db2b

.gitattributes

@@ -9,7 +9,7 @@ thirdparty/* linguist-vendored
 *.bat eol=crlf
 *.sln eol=crlf
 *.csproj eol=crlf
-misc/msvs/*.template eol=crlf
+misc/msvs/* eol=crlf
 # And some test files where the EOL matters
 *.test.txt -text
 

.github/CODEOWNERS

@@ -44,19 +44,25 @@
 
 # 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
-/editor/**/*script*                           @godotengine/script-editor
-/editor/**/*shader*                           @godotengine/shaders
+/editor/                                      @godotengine/docks
+/editor/script/                               @godotengine/script-editor
+/editor/shader/                               @godotengine/script-editor @godotengine/shaders
+/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/themes/                               @godotengine/usability @godotengine/gui-nodes
+/editor/translations/                         @godotengine/usability
 
 # Main
 
@@ -167,7 +173,8 @@
 /modules/gridmap/                             @godotengine/3d-nodes
 /modules/gridmap/doc_classes/                 @godotengine/3d-nodes @godotengine/documentation
 /modules/gridmap/icons/                       @godotengine/3d-nodes @godotengine/usability
-/modules/navigation/                          @godotengine/navigation
+/modules/navigation_2d/                       @godotengine/navigation
+/modules/navigation_3d/                       @godotengine/navigation
 /modules/noise/                               @godotengine/core
 /modules/noise/doc_classes/                   @godotengine/core @godotengine/documentation
 /modules/noise/icons/                         @godotengine/core @godotengine/usability
@@ -178,6 +185,7 @@
 /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
 

.github/actions/godot-api-dump/action.yml

@@ -5,35 +5,26 @@ inputs:
   target:
     description: Build target (editor, template_release, template_debug).
     default: editor
-  tests:
-    description: Unit tests.
-    default: false
-    required: false
+    type: choice
+    options: [editor, template_debug, template_release]
   platform:
     description: Target platform.
-    required: false
-  sconsflags:
+    type: string
+  scons-flags:
     description: Additional SCons flags.
-    default: ""
-    required: false
+    type: string
   scons-cache:
     description: The SCons cache path.
     default: ${{ github.workspace }}/.scons_cache/
-  scons-cache-limit:
-    description: The SCons cache size limit.
-    # actions/cache has 10 GiB limit, and GitHub runners have a 14 GiB disk.
-    # Limit to 7 GiB to avoid having the extracted cache fill the disk.
-    default: 7
+    type: string
 
 runs:
   using: composite
   steps:
     - name: SCons Build
       shell: sh
-      env:
-        SCONSFLAGS: ${{ inputs.sconsflags }}
       run: |
-        echo "Building with flags:" platform=${{ inputs.platform }} target=${{ inputs.target }} tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }} "cache_path=${{ inputs.scons-cache }}" cache_limit=${{ inputs.scons-cache-limit }}
+        echo "Building with flags:" platform=${{ inputs.platform }} target=${{ inputs.target }} ${{ inputs.scons-flags }} "cache_path=${{ inputs.scons-cache }}" redirect_build_objects=no
 
         if [ "${{ inputs.target }}" != "editor" ]; then
           # Ensure we don't include editor code in export template builds.
@@ -47,5 +38,5 @@ runs:
           export BUILD_NAME="gh"
         fi
 
-        scons platform=${{ inputs.platform }} target=${{ inputs.target }} tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }} "cache_path=${{ inputs.scons-cache }}" cache_limit=${{ inputs.scons-cache-limit }}
+        scons platform=${{ inputs.platform }} target=${{ inputs.target }} ${{ inputs.scons-flags }} "cache_path=${{ inputs.scons-cache }}" redirect_build_objects=no
         ls -l bin/

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

@@ -11,24 +11,29 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Restore SCons cache directory
+    - name: Restore default cache
       uses: actions/cache/restore@v4
+      id: cache-ping
       with:
         path: ${{ inputs.scons-cache }}
-        key: ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}
+        key: ${{ inputs.cache-name }}|${{ github.event.repository.default_branch }}|${{ github.sha }}
+        restore-keys: ${{ inputs.cache-name }}|${{ github.event.repository.default_branch }}
 
-        # We try to match an existing cache to restore from it. Each potential key is checked against
-        # all existing caches as a prefix. E.g. 'linux-template-minimal' would match any cache that
-        # starts with "linux-template-minimal", such as "linux-template-minimal-master-refs/heads/master-6588a4a29af1621086feac0117d5d4d37af957fd".
-        #
-        # We check these prefixes in this order:
-        #
-        #   1. The exact match, including the base branch, the commit reference, and the SHA hash of the commit.
-        #   2. A partial match for the same base branch and the same commit reference.
-        #   3. A partial match for the same base branch and the base branch commit reference.
-        #   4. A partial match for the same base branch only (not ideal, matches any PR with the same base branch).
+    - name: Log default cache files
+      if: steps.cache-ping.outputs.cache-matched-key && github.ref_name != github.event.repository.default_branch
+      shell: sh
+      run: find "${{ inputs.scons-cache }}" >> redundant.txt
 
-        restore-keys: |
-          ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}
-          ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-refs/heads/${{ env.GODOT_BASE_BRANCH }}
-          ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}
+    # 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
+      if: github.ref_name != github.event.repository.default_branch
+      with:
+        path: ${{ inputs.scons-cache }}
+        key: ${{ inputs.cache-name }}|${{ github.ref_name }}|${{ github.sha }}
+        restore-keys: ${{ inputs.cache-name }}|${{ github.ref_name }}
+
+    - name: Store unix timestamp
+      shell: sh
+      run: echo "CACHE_TIMESTAMP=$(date +%s)" >> $GITHUB_ENV