Merge branch 'master' into my_master

.git-blame-ignore-revs

@@ -51,3 +51,6 @@ bd282ff43f23fe845f29a3e25c8efc01bd65ffb0
 
 # Add "Godot Engine contributors" copyright line
 df61dc4b2bd54a5a40c515493c76f5a458e5b541
+
+# Enforce template syntax `typename` over `class`
+9903e6779b70fc03aae70a37b9cf053f4f355b91

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -45,7 +45,8 @@ body:
     label: Issue description
     description: |
       Describe your issue briefly. What doesn't work, and how do you expect it to work instead?
-      You can include images or videos with drag and drop, and format code blocks or logs with <code>```</code> tags.
+      You can include images or videos with drag and drop, and format code blocks or logs with <code>\`\`\`</code> tags, on separate lines before and after the text. (Use <code>\`\`\`gdscript</code> to add GDScript syntax highlighting.)
+      Please do not add code examples or error messages as screenshots, but as text, this helps searching for issues and testing the code. If you are reporting a bug in the editor interface, like the script editor, please provide both a screenshot *and* the text of the code to help with testing.
   validations:
     required: true
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,7 @@
 <!--
 Please target the `master` branch in priority.
-PRs can target `3.x` if the same change was done in `master`, or is not relevant there.
 
 Relevant fixes are cherry-picked for stable branches as needed by maintainers.
-You can mention in the description if the change is compatible with `3.x`.
 
 To speed up the contribution process and avoid CI errors, please set up pre-commit hooks locally:
 https://docs.godotengine.org/en/latest/contributing/development/code_style_guidelines.html

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

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

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

@@ -12,7 +12,7 @@ runs:
   steps:
     # Upload cache on completion and check it out now
     - name: Load .scons_cache directory
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{inputs.scons-cache}}
         key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

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

@@ -12,7 +12,7 @@ runs:
   steps:
     # Use python 3.x release (works cross platform)
     - name: Set up Python 3.x
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         # Semantic version range syntax or exact version of a Python version
         python-version: ${{ inputs.python-version }}

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

@@ -12,7 +12,7 @@ runs:
   using: "composite"
   steps:
     - name: Upload Godot Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.name }}
         path: ${{ inputs.path }}

.github/workflows/android_builds.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Java 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17

.github/workflows/godot_cpp_test.yml

@@ -7,7 +7,7 @@ env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: master
   # Used for the godot-cpp checkout.
-  GODOT_CPP_BRANCH: '4.1'
+  GODOT_CPP_BRANCH: '4.2'
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-cpp-tests

.github/workflows/linux_builds.yml

@@ -116,12 +116,6 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
-      - name: Set up .NET Sdk
-        uses: actions/setup-dotnet@v3
-        if: ${{ matrix.build-mono }}
-        with:
-          dotnet-version: '6.0.x'
-
       - name: Setup GCC problem matcher
         uses: ammaraskar/gcc-problem-matcher@master
 
@@ -169,6 +163,11 @@ jobs:
           ${{ matrix.bin }} --help
           ${{ matrix.bin }} --headless --test --force-colors
 
+      - name: .NET source generators tests
+        if: ${{ matrix.build-mono }}
+        run: |
+          dotnet test modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests
+
       # Check class reference
       - name: Check for class reference updates
         if: ${{ matrix.doc-test }}

.github/workflows/static_checks.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Install Python dependencies and general setup
         run: |
-          pip3 install black==23.3.0 pytest==7.1.2 mypy==0.971
+          pip3 install pytest==7.1.2 mypy==0.971
           git config diff.wsErrorHighlight all
 
       - name: Get changed files
@@ -46,6 +46,9 @@ jobs:
         run: |
           bash ./misc/scripts/gitignore_check.sh
 
+      - name: Style checks via pre-commit
+        uses: pre-commit/[email protected]
+
       - name: File formatting checks (file_format.sh)
         run: |
           bash ./misc/scripts/file_format.sh changed.txt
@@ -54,14 +57,6 @@ jobs:
         run: |
           bash ./misc/scripts/header_guards.sh changed.txt
 
-      - name: Python style checks via black (black_format.sh)
-        run: |
-          if grep -qE '\.py$|SConstruct|SCsub' changed.txt || [ -z "$(cat changed.txt)" ]; then
-            bash ./misc/scripts/black_format.sh
-          else
-            echo "Skipping Python formatting as no Python files were changed."
-          fi
-
       - name: Python scripts static analysis (mypy_check.sh)
         run: |
           if grep -qE '\.py$|SConstruct|SCsub' changed.txt || [ -z "$(cat changed.txt)" ]; then
@@ -76,7 +71,7 @@ jobs:
 
       - name: JavaScript style and documentation checks via ESLint and JSDoc
         run: |
-          if grep -q "platform/web" changed.txt || [ -z "$(cat changed.txt)" ]; then
+          if grep -q "\.js" changed.txt || [ -z "$(cat changed.txt)" ]; then
             cd platform/web
             npm ci
             npm run lint
@@ -92,20 +87,6 @@ jobs:
       - name: Documentation checks
         run: |
           doc/tools/doc_status.py doc/classes modules/*/doc_classes platform/*/doc_classes
-          doc/tools/make_rst.py --dry-run --color doc/classes modules platform
-
-      - name: Style checks via clang-format (clang_format.sh)
-        run: |
-          clang-format --version
-          bash ./misc/scripts/clang_format.sh changed.txt
-
-      - name: Style checks via dotnet format (dotnet_format.sh)
-        run: |
-          if grep -q "modules/mono" changed.txt || [ -z "$(cat changed.txt)" ]; then
-            bash ./misc/scripts/dotnet_format.sh
-          else
-            echo "Skipping dotnet format as no C# files were changed."
-          fi
 
       - name: Spell checks via codespell
         if: github.event_name == 'pull_request' && env.CHANGED_FILES != ''

.gitignore

@@ -43,6 +43,7 @@ logs/
 
 # Generated by unit tests
 tests/data/*.translation
+tests/data/crypto/out*
 
 ############################
 ### General build output ###

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "ActiveProjects/ProjectCubeSphere"]
 	path = ActiveProjects/ProjectCubeSphere
 	url = https://github.com/mschwarz1/ProjectCubeSphere.git
-[submodule "modules/GDPlanetaryTerrain"]
-	path = modules/GDPlanetaryTerrain
-	url = https://github.com/mschwarz1/GDPlanetaryTerrain.git
 [submodule "ActiveProjects/MinstralPlayground"]
 	path = ActiveProjects/MinstralPlayground
 	url = https://github.com/mschwarz1/MinstralPlayground.git

.mailmap

@@ -118,6 +118,7 @@ Nathan Warden <[email protected]> <[email protected]>
 Nicholas Huelin <[email protected]>
 Nils ANDRÉ-CHANG <[email protected]>
 Nils ANDRÉ-CHANG <[email protected]> <[email protected]>
+Nông Văn Tình <[email protected]>
 Nuno Donato <[email protected]> <[email protected]>
 ocean (they/them) <[email protected]>
 Pawel Kowal <[email protected]>

.pre-commit-config.yaml

@@ -0,0 +1,55 @@
+repos:
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v17.0.6
+    hooks:
+      - id: clang-format
+        files: \.(c|h|cpp|hpp|cc|cxx|m|mm|inc|java|glsl)$
+        types_or: [text]
+        exclude: |
+          (?x)^(
+            tests/python_build.*|
+            .*thirdparty.*|
+            .*platform/android/java/lib/src/com.*|
+            .*-so_wrap.*
+          )
+
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.2.0
+    hooks:
+      - id: black
+        files: (\.py$|SConstruct|SCsub)
+        types_or: [text]
+        exclude: .*thirdparty.*
+        args:
+          - --line-length=120
+
+  - repo: local
+    hooks:
+      - id: make-rst
+        name: make-rst
+        entry: python3 doc/tools/make_rst.py doc/classes modules platform --dry-run --color
+        pass_filenames: false
+        language: python
+        files: ^(doc|modules|platform).*xml$
+
+      - id: copyright-headers
+        name: copyright-headers
+        language: python
+        files: \.(c|h|cpp|hpp|cc|cxx|m|mm|inc|java)$
+        entry: python3 misc/scripts/copyright_headers.py
+        exclude: |
+          (?x)^(
+            .*thirdparty.*|
+            .*-so_wrap.*|
+            core/math/bvh_.*\.inc$|
+            platform/android/java/lib/src/com.*|
+            platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.*|
+            platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.*|
+            platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.*
+          )
+
+      - id: dotnet-format
+        name: dotnet-format
+        language: python
+        entry: python3 misc/scripts/dotnet_format.py
+        types_or: [c#]

AUTHORS.md

@@ -31,6 +31,7 @@ name is available.
     Aaron Record (LightningAA)
     Adam Scott (adamscott)
     Alexander Holland (AlexHolly)
+    Alex Drozd (brno32)
     Alexey Khoroshavin (allkhor)
     Alfred Reinold Baudisch (alfredbaudisch)
     Alket Rexhepi (alketii)
@@ -46,13 +47,15 @@ name is available.
     Aren Villanueva (kurikaesu)
     Ariel Manzur (punto-)
     AThousandShips
+    aXu-AP
     Bartłomiej T. Listwon (Listwon)
     Bastiaan Olij (BastiaanOlij)
     Ben Brookshire (sheepandshepherd)
     Benjamin Larsson (Nallebeorn)
     Bernhard Liebl (poke1024)
     Bhuvan Vemula (Bhu1-V)
     bitsawer
+    BlueCube3310
     Błażej Szczygieł (zaps166)
     Bojidar Marinov (bojidar-bg)
     Brian Semrau (briansemrau)
@@ -159,6 +162,7 @@ name is available.
     Lucien Menassol (Kanabenki)
     Lyuma
     Maganty Rushyendra (mrushyendra)
+    Malcolm Nixon (Malcolmnixon)
     Manuele Finocchiaro (m4nu3lf)
     Marcel Admiraal (madmiraal)
     Marcelo Fernandez (marcelofg55)
@@ -191,6 +195,7 @@ name is available.
     Micky (Mickeon)
     Mikael Hermansson (mihe)
     MinusKube
+    MJacred
     Morris "Tabor" Arroad (mortarroad)
     mrezai
     Muhammad Huri (CakHuri)
@@ -209,6 +214,7 @@ name is available.
     Omar El Sheikh (The-O-King)
     Ovnuniarchos
     Pascal Richter (ShyRed)
+    Patrick Dawson (pkdawson)
     Patrick Exner (FlameLizard)
     Patrick (firefly2442)
     Paul Batty (Paulb23)
@@ -237,6 +243,7 @@ name is available.
     Ricardo Subtil (Ev1lbl0w)
     Riteo Siuga (Riteo)
     Roberto F. Arroyo (robfram)
+    Robert Yevdokimov (ryevdokimov)
     Robin Hübner (profan)
     romulox-x
     Rune Smith (rune-scape)
@@ -245,13 +252,16 @@ name is available.
     Saniko (sanikoyes)
     santouits
     SaracenOne
+    Septian Ganendra S. K. (sepTN)
     Sergey Minakov (naithar)
     sersoong
     Shiqing (kawa-yoiko)
     Silc 'Tokage' Renew (TokageItLab)
     Simon Wenner (swenner)
     smix8
     snailrhymer
+    Sofox (TheSofox)
+    Stanislav Labzyuk (DarkMessiah)
     Stijn Hinlopen (hinlopen)
     stmSi
     Swarnim Arun (minraws)