Merge branch 'godotengine:master' into 4.x

roalyr · Dec 1, 2023 · 7517867 · 7517867
2 parents 1dc3f4f + d76c1d0
commit 7517867
Show file tree

Hide file tree

Showing 444 changed files with 232,235 additions and 14,337 deletions.
diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
@@ -112,5 +112,5 @@ jobs:
         uses: codespell-project/actions-codespell@v2
         with:
           skip: "./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./AUTHORS.md,./COPYRIGHT.txt,./DONORS.md,./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/project_converter_3_to_4.cpp,./misc/scripts/codespell.sh,./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json"
-          ignore_words_list: "curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai"
+          ignore_words_list: "breaked,curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai"
           path: ${{ env.CHANGED_FILES }}
diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
@@ -7,7 +7,7 @@ env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no
-  EM_VERSION: 3.1.45
+  EM_VERSION: 3.1.39
   EM_CACHE_FOLDER: "emsdk-cache"
 
 concurrency:

diff --git a/.mailmap b/.mailmap
@@ -14,12 +14,14 @@ Ariel Manzur <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]> <[email protected]>
+A Thousand Ships <[email protected]> <[email protected]>
 Bastiaan Olij <[email protected]>
 Benjamin <[email protected]>
 Bernhard Liebl <[email protected]> <[email protected]>
 Bernhard Liebl <[email protected]> <[email protected]>
 Bruno Lourenço <[email protected]> <[email protected]>
 Chaosus <[email protected]>
+ChibiDenDen <[email protected]>
 Chris Bradfield <[email protected]> <[email protected]>
 Clay John <[email protected]>
 Clay John <[email protected]> <[email protected]>
@@ -40,6 +42,7 @@ Fabian <[email protected]>
 Ferenc Arn <[email protected]>
 Ferenc Arn <[email protected]> <[email protected]>
 FireForge <[email protected]> <[email protected]>
+Florian Kothmeier <[email protected]>
 foxydevloper <[email protected]>
 Fredia Huya-Kouadio <[email protected]>
 Fredia Huya-Kouadio <[email protected]> <[email protected]>
@@ -119,6 +122,7 @@ Nuno Donato <[email protected]> <[email protected]>
 ocean (they/them) <[email protected]>
 Pawel Kowal <[email protected]>
 Pedro J. Estébanez <[email protected]> <[email protected]>
+Patrick Exner <[email protected]>
 Patrick <[email protected]>
 Paul Batty <[email protected]>
 Paul Batty <[email protected]> <[email protected]>

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -62,6 +62,7 @@ name is available.
     Caner Demirer (cdemirer)
     Carl Olsson (not-surt)
     Carter Anderson (cart)
+    ChibiDenDen
     Chris Bradfield (cbscribe)
     Clay John (clayjohn)
     ConteZero
@@ -71,6 +72,7 @@ name is available.
     Daniel Zilberleyb (dzil123)
     Danil Alexeev (dalexeev)
     dankan1890
+    Darío Banini (DarioSamo)
     David Cambré (Gallilus)
     David Sichma (DavidSichma)
     David Snopek (dsnopek)
@@ -95,6 +97,7 @@ name is available.
     Fabrice Cipolla (fabriceci)
     Ferenc Arn (tagcup)
     FireForge (fire-forge)
+    Florian Kothmeier (Dragoncraft89)
     follower
     foxydevloper
     François Belair (Razoric480)
@@ -113,6 +116,7 @@ name is available.
     Hendrik Brucker (Geometror)
     hilfazer
     Hiroshi Ogawa (hi-ogawa)
+    HolonProduction
     homer666
     hoontee
     Hugo Locurcio (Calinou)
@@ -174,6 +178,7 @@ name is available.
     marynate
     Masoud BH (masoudbh3)
     Mateo Kuruk Miccino (kuruk-mm)
+    Matias N. Goldberg (darksylinc)
     Matthew (skyace65)
     Matthias Hölzl (hoelzl)
     Max Hilbrunner (mhilbrunner)
@@ -190,6 +195,7 @@ name is available.
     mrezai
     Muhammad Huri (CakHuri)
     muiroc
+    myaaaaaaaaa
     Nathan Franke (nathanfranke)
     Nathan Lovato (NathanLovato)
     Nathan Warden (NathanWarden)
@@ -203,6 +209,7 @@ name is available.
     Omar El Sheikh (The-O-King)
     Ovnuniarchos
     Pascal Richter (ShyRed)
+    Patrick Exner (FlameLizard)
     Patrick (firefly2442)
     Paul Batty (Paulb23)
     Paul Joannon (paulloz)
@@ -246,9 +253,11 @@ name is available.
     smix8
     snailrhymer
     Stijn Hinlopen (hinlopen)
+    stmSi
     Swarnim Arun (minraws)
     TC (floppyhammer)
     TechnoPorg
+    Thaddeus Crews (Repiteo)
     Thakee Nathees (ThakeeNathees)
     thebestnom
     Theo Hallenius (TheoXD)
@@ -275,4 +284,5 @@ name is available.
     Zak Stam (zaksnet)
     Zher Huei Lee (leezh)
     ZuBsPaCe
+    谢天 (jsjtxietian)
     风青山 (Rindbee)