Merge branch 'master' into my_master

.clang-tidy

@@ -2,7 +2,6 @@
 Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,cppcoreguidelines-pro-type-member-init,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-nullptr,readability-braces-around-statements,readability-redundant-member-init'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
 FormatStyle: none
 CheckOptions:
   - key:             cert-dcl16-c.NewSuffixes

.gitattributes

@@ -5,12 +5,13 @@ thirdparty/* linguist-vendored
 
 # Normalize EOL for all files that Git considers text files
 * text=auto eol=lf
-# Except for bat files, which are Windows only files
+# Except for Windows-only / Visual Studio files
 *.bat eol=crlf
+*.sln eol=crlf
+*.csproj eol=crlf
+misc/msvs/*.template eol=crlf
 # And some test files where the EOL matters
 *.test.txt -text
-# And also the templates for Visual Studio files, which VS will always force CRLF on
-/misc/msvs/*.template eol=crlf
 
 # The above only works properly for Git 2.10+, so for older versions
 # we need to manually list the binary files we don't want modified.

.github/workflows/static_checks.yml

@@ -48,6 +48,8 @@ jobs:
 
       - name: Style checks via pre-commit
         uses: pre-commit/[email protected]
+        with:
+          extra_args: --verbose --files ${{ env.CHANGED_FILES }}
 
       - name: File formatting checks (file_format.sh)
         run: |
@@ -93,5 +95,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: "breaked,curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai"
+          ignore_words_list: "breaked,colour,curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,thirdparty,vai"
           path: ${{ env.CHANGED_FILES }}

.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.39
+  EM_VERSION: 3.1.59
   EM_CACHE_FOLDER: "emsdk-cache"
 
 concurrency:

.mailmap

@@ -14,6 +14,7 @@ Ariel Manzur <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]> <[email protected]>
+Arman Elgudzhyan <[email protected]>
 A Thousand Ships <[email protected]> <[email protected]>
 Bastiaan Olij <[email protected]>
 Benjamin <[email protected]>
@@ -77,6 +78,7 @@ Jason Knight <[email protected]> <[email protected]>
 Jean-Michel Bernard <[email protected]>
 Jérôme Gully <[email protected]>
 JFonS <[email protected]>
+jitspoe <[email protected]> <jitspoeAyahoooDcom>
 Juan Linietsky <[email protected]>
 Juan Linietsky <[email protected]> <[email protected]>
 Juan Linietsky <[email protected]> <[email protected]>

AUTHORS.md

@@ -48,6 +48,7 @@ name is available.
     Anutrix
     Aren Villanueva (kurikaesu)
     Ariel Manzur (punto-)
+    Arman Elgudzhyan (puchik)
     AThousandShips
     aXu-AP
     Bartłomiej T. Listwon (Listwon)
@@ -141,6 +142,7 @@ name is available.
     Jean-Michel Bernard (jmb462)
     Jérôme Gully (Nutriz)
     Jia Jun Chai (SkyLucilfer)
+    jitspoe
     Joan Fons Sanchez (JFonS)
     Johan Manuel (29jm)
     Johannes Witt (HaSa1002)
@@ -217,6 +219,7 @@ name is available.
     Omar El Sheikh (The-O-King)
     Ovnuniarchos
     Pascal Richter (ShyRed)
+    passivestar
     Patrick Dawson (pkdawson)
     Patrick Exner (FlameLizard)
     Patrick (firefly2442)
@@ -232,6 +235,7 @@ name is available.
     Poommetee Ketson (Noshyaar)
     Przemysław Gołąb (n-pigeon)
     Rafael M. G. (rafallus)
+    Raffaele Picca (RPicster)
     Rafał Mikrut (qarmin)
     Ralf Hölzemer (rollenrolm)
     Ramesh Ravone (RameshRavone)
@@ -298,6 +302,7 @@ name is available.
     Zae Chao (zaevi)
     Zak Stam (zaksnet)
     Zher Huei Lee (leezh)
+    Zi Ye (MajorMcDoom)
     ZuBsPaCe
     谢天 (jsjtxietian)
     风青山 (Rindbee)

COPYRIGHT.txt

@@ -293,6 +293,11 @@ Comment: jpeg-compressor
 Copyright: 2012, Rich Geldreich
 License: public-domain or Apache-2.0
 
+Files: ./thirdparty/libbacktrace/
+Comment: libbacktrace
+Copyright: 2012-2021, Free Software Foundation, Inc.
+License: BSD-3-clause
+
 Files: ./thirdparty/libktx/
 Comment: KTX
 Copyright: 2013-2020, Mark Callow
@@ -406,6 +411,11 @@ Comment: PolyPartition / Triangulator
 Copyright: 2011-2021, Ivan Fratric and contributors
 License: Expat
 
+Files: ./thirdparty/misc/qoa.h
+Comment: Quite OK Audio Format
+Copyright: 2023, Dominic Szablewski
+License: Expat
+
 Files: ./thirdparty/misc/r128.c
  ./thirdparty/misc/r128.h
 Comment: r128 library

DONORS.md

@@ -32,10 +32,8 @@ generous deed immortalized in the next stable release of Godot Engine.
 
 ## Silver sponsors
 
-    Affray Interactive <https://scp.games/pandemic/>
     Broken Rules <https://brokenrul.es/>
     Chasing Carrots <https://www.chasing-carrots.com/>
-    Gamblify <https://www.gamblify.com/>
     Indoor Astronaut <https://indoorastronaut.ch/>
     Null <https://null.com/>
     Orbital Knight <https://www.orbitalknight.com/>
@@ -56,6 +54,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     Garry Newman
     Isaiah Smith <https://www.isaiahsmith.dev/>
     Kenney <https://kenney.nl/>
+    Libretrend <https://libretrend.com/>
     Life Art Studios <https://lifeartstudios.net/>
     Lucid Silence Games
     Matthew Campbell
@@ -99,19 +98,21 @@ generous deed immortalized in the next stable release of Godot Engine.
     Scott Pezza
     ShikadiGum
     Silver Creek Entertainment
+    SolarLabyrinth
     Stephan Kessler
     Stephan Lanfermann
     TigerJ
     Tim Yuen
     Violin Iliev
     Vladimír Chvátil
-    And 16 anonymous donors
+    And 15 anonymous donors
 
 ## Gold members
 
     @reilaos
     alMoo Games
     Alva Majo
+    Amadan Interactive (Cillian Clifford)
     Antti Vesanen
     Artur Ilkaev
     Asher Glick
@@ -124,21 +125,31 @@ generous deed immortalized in the next stable release of Godot Engine.
     Brian Levinsen
     Brut
     Carlo del Mundo
+    Chickensoft
     ClarkThyLord
     Cosmin Munteanu
+    cowoder
     Coy Humphrey
+    Daniel Eichler
     David Chen Zhen
     David Coles
     David Hubber
     David Snopek
+    Deakcor
     Delton Ding
+    dfseifert
+    Don't You Know Who I Am? Inc.
+    Dono
     Dustuu
+    Edelweiss
     ElektroFox
     endaye
     Ends
+    Eren Öğrül
     Eric Phy
     Faisal Al-Kubaisi (QatariGameDev)
     FeralBytes
+    Garrus Vakarian
     GlassBrick
     Grau
     Guangzhou Lingchan
@@ -153,6 +164,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     John Gabriel
     Jon Woodward
     José Canepa
+    Justin Sasso
     KAR Games
     Karasu Studio
     korinVR
@@ -167,6 +179,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     Mara Huldra
     Martin Šenkeřík
     Megabit Interactive
+    Michael Gooch
     Modus Ponens
     nezticle
     Niklas Wahrman
@@ -183,19 +196,25 @@ generous deed immortalized in the next stable release of Godot Engine.
     Robin Ward
     Saltlight Studio
     Samuel Judd
+    ScoreSpace
     Silverclad Studios
     Sofox
     Space Kraken Studios
     Spoony Panda
+    TANAKA Yu
+    TaraSophieDev
     ThatGamer
     ThePolyglotProgrammer
     Tim Nedvyga
     Tom Langwaldt
     Trevor Slocum
     tukon
+    Vagastella
     Vincent Foulon
     Weasel Games
     WuotanStudios.com
+    Yury K.
+    Zee Weasel
     Zhu Li
     zikes
 
@@ -530,7 +549,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     ケルベロス
     貴宏 小松
 
-    And 208 anonymous donors
+    And 201 anonymous donors
 
 ## Silver and bronze donors