fix

.gitignore

@@ -8,13 +8,10 @@ doc/_build/
 *.bc
 
 # Android specific
-platform/android/java/build.gradle
 platform/android/java/.gradle
 platform/android/java/.gradletasknamecache
 platform/android/java/local.properties
 platform/android/java/project.properties
-platform/android/java/build.gradle
-platform/android/java/AndroidManifest.xml
 platform/android/java/libs/*
 platform/android/java/assets
 platform/android/java/.idea/*
@@ -43,12 +40,14 @@ gmon.out
 *.swo
 *.swp
 
-# QT project files
+# Qt project files
 *.config
 *.creator
 *.creator.*
 *.files
 *.includes
+*.cflags
+*.cxxflags
 
 # Eclipse CDT files
 .cproject
@@ -316,3 +315,10 @@ platform/windows/godot_res.res
 
 # Scons progress indicator
 .scons_node_count
+
+# ccls cache (https://github.com/MaskRay/ccls)
+.ccls-cache/
+
+# compile commands (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
+compile_commands.json
+

.mailmap

@@ -1,29 +1,69 @@
+Alexander Holland <[email protected]>
+Alexander Holland <[email protected]> <[email protected]>
+Alexander Holland <[email protected]> <AlexHolly>
 Andrea Catania <[email protected]>
 Andreas Haas <[email protected]>
-Andreas Haas <[email protected]>
-Andreas Haas <[email protected]>
+Andreas Haas <[email protected]> <[email protected]>
+Andreas Haas <[email protected]> <[email protected]>
+Andreas Haas <[email protected]> <[email protected]>
 Ariel Manzur <[email protected]>
-Ariel Manzur <[email protected]>
+Ariel Manzur <[email protected]> <[email protected]>
+Ariel Manzur <[email protected]> <[email protected]>
+Ariel Manzur <[email protected]> <[email protected]>
+Ariel Manzur <[email protected]> <[email protected]>
 Bastiaan Olij <[email protected]>
-Bernhard Liebl <[email protected]>
-Bernhard Liebl <[email protected]>
+Bernhard Liebl <[email protected]> <[email protected]>
+Bernhard Liebl <[email protected]> <[email protected]>
+Chris Bradfield <[email protected]> <[email protected]>
+Clay John <[email protected]>
+Clay John <[email protected]> <[email protected]>
+Dana Olson <[email protected]> <[email protected]>
+Daniel J. Ramirez <[email protected]>
+Ferenc Arn <[email protected]>
+Ferenc Arn <[email protected]> <[email protected]>
 Geequlim <[email protected]>
-Hugo Locurcio <[email protected]>
+Gilles Roudiere <[email protected]>
+Gilles Roudiere <[email protected]> <[email protected]>
+Guilherme Felipe <[email protected]>
 Hugo Locurcio <[email protected]> <[email protected]>
 Hugo Locurcio <[email protected]> <[email protected]>
+Hugo Locurcio <[email protected]> Calinou <[email protected]>
+Ian Bishop <[email protected]>
 Ignacio Etcheverry <[email protected]>
+Ignacio Etcheverry <[email protected]> <[email protected]>
 Indah Sylvia <[email protected]>
+J08nY <[email protected]> <[email protected]>
+J08nY <[email protected]> <[email protected]>
 Jakub Grzesik <[email protected]>
+Jérôme Gully <[email protected]>
 Juan Linietsky <[email protected]>
-Juan Linietsky <[email protected]>
-Juan Linietsky <[email protected]>
+Juan Linietsky <[email protected]> <[email protected]>
+Juan Linietsky <[email protected]> <[email protected]>
+Juan Linietsky <[email protected]> <[email protected]>
+Juan Linietsky <[email protected]> <red@kyoko>
 Julian Murgia <[email protected]>
-Leon Krause <[email protected]>
-Leon Krause <[email protected]> <[email protected]>
+Kelly Thomas <[email protected]>
+Leon Krause <[email protected]> <[email protected]>
+Leon Krause <[email protected]> <[email protected]>
 Marcelo Fernandez <[email protected]>
+Marcin Zawiejski <[email protected]>
 Mariano Javier Suligoy <[email protected]>
+Mario Schlack <[email protected]>
+Max Hilbrunner <[email protected]>
+Max Hilbrunner <[email protected]> <[email protected]>
+Nathan Warden <[email protected]> <[email protected]>
+Nuno Donato <[email protected]> <[email protected]>
+Pedro J. Estébanez <[email protected]> <[email protected]>
 Paul Batty <[email protected]>
+Paul Batty <[email protected]> <[email protected]>
+Pieter-Jan Briers <[email protected]>
+Pieter-Jan Briers <[email protected]> <[email protected]>
 Poommetee Ketson <[email protected]>
+Rémi Verschelde <[email protected]> <[email protected]>
+Ruslan Mustakov <[email protected]> <[email protected]>
 Saracen <[email protected]>
+Theo Hallenius <[email protected]>
 Thomas Herzog <[email protected]>
+Thomas Herzog <[email protected]> <[email protected]>
+Thomas Herzog <[email protected]> <[email protected]>
 Zher Huei Lee <[email protected]>

.travis.yml

@@ -27,7 +27,7 @@ matrix:
           packages:
             - clang-format-6.0
 
-    - env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no werror=yes"
+    - env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
       os: linux
       compiler: gcc-8
       addons:
@@ -49,15 +49,15 @@ matrix:
           build_command: "scons p=x11 -j2 $OPTIONS"
           branch_pattern: coverity_scan
 
-    - env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
+    - env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
       os: linux
       compiler: clang
       addons:
         apt:
           packages:
             - *linux_deps
 
-    - env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
+    - env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
       os: linux
       compiler: clang
 
@@ -69,7 +69,7 @@ matrix:
       os: osx
       compiler: clang
 
-    - env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="werror=yes"
+    - env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="warnings=extra werror=yes"
       os: linux
       compiler: gcc-8
       addons:

AUTHORS.md

@@ -25,16 +25,16 @@ name is available.
 
 ## Developers
 
-(in alphabetical order, with 10 commits or more excluding merges)
+(in alphabetical order, with over 10 commits excluding merges)
 
     Aaron Franke (aaronfranke)
     Alexander Holland (AlexHolly)
-    Alexey Velikiy (jonyrock)
     Alket Rexhepi (alketii)
     Andrea Catania (AndreaCatania)
     Andreas Haas (Hinsbart)
     Andrii Doroshenko (Xrayez)
     Andy Moss (MillionOstrich)
+    Anish Bhobe (KidRigger)
     Anton Yabchinskiy (a12n)
     Aren Villanueva (kurikaesu)
     Ariel Manzur (punto-)
@@ -45,7 +45,9 @@ name is available.
     Błażej Szczygieł (zaps166)
     Bojidar Marinov (bojidar-bg)
     bruvzg
+    Camille Mohr-Daurat (pouleyKetchoupp)
     Carl Olsson (not-surt)
+    Carter Anderson (cart)
     Chris Bradfield (cbscribe)
     Clay John (clayjohn)
     Dana Olson (adolson)
@@ -61,13 +63,13 @@ name is available.
     Ferenc Arn (tagcup)
     Franklin Sobrinho (TheHX)
     Geequlim
-    Gen (dbsGen)
     George Marques (vnen)
     Gerrit Großkopf (Grosskopf)
     Gilles Roudiere (groud)
     Guilherme Felipe de C. G. da Silva (guilhermefelipecgs)
     Hein-Pieter van Braam (hpvb)
     Hiroshi Ogawa (hi-ogawa)
+    homer666
     Hubert Jarosz (Marqin)
     Hugo Locurcio (Calinou)
     Ian Bishop (ianb96)
@@ -76,7 +78,7 @@ name is available.
     Indah Sylvia (ISylvox)
     J08nY
     Jakub Grzesik (kubecz3k)
-    Jérôme GULLY (Nutriz)
+    Jérôme Gully (Nutriz)
     Joan Fons Sanchez (JFonS)
     Johan Manuel (29jm)
     Joshua Grams (JoshuaGrams)
@@ -87,13 +89,15 @@ name is available.
     Kostadin Damyanov (Max-Might)
     K. S. Ernest (iFire) Lee (fire)
     Leon Krause (eska014)
+    Lucien Menassol (Kanabenki)
     m4nu3lf
     Marcelo Fernandez (marcelofg55)
     Marc Gilleron (Zylann)
     Marcin Zawiejski (dragmz)
     Mariano Javier Suligoy (MarianoGnu)
     Mario Schlack (hurikhan)
     Martin Capitanio (capnm)
+    Martin Liška (marxin)
     Martin Sjursen (binbitten)
     marynate
     Masoud BH (masoudbh3)
@@ -113,6 +117,7 @@ name is available.
     Pieter-Jan Briers (PJB3005)
     Poommetee Ketson (Noshyaar)
     Przemysław Gołąb (n-pigeon)
+    Rafał Mikrut (qarmin)
     Ralf Hölzemer (rollenrolm)
     Ramesh Ravone (RameshRavone)
     Ray Koopa (RayKoopa)
@@ -124,10 +129,12 @@ name is available.
     Saniko (sanikoyes)
     SaracenOne
     sersoong
+    Simon Wenner (swenner)
     Theo Hallenius (TheoXD)
     Thomas Herzog (karroffel)
     Timo (toger5)
     Timo Schwarzer (timoschwarzer)
+    Tomasz Chabora (KoBeWi)
     Vinzenz Feenstra (vinzenz)
     박한얼 (volzhs)
     V. Vamsi Krishna (vkbsb)

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+## [3.1] - 2019-03-13
 
 ### Added
 
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
   - Support for RayCast shapes in kinematic bodies.
   - Support for synchronizing kinematic movement to physics, avoiding an one-frame delay.
 - WebSockets support using [libwebsockets](https://libwebsockets.org/).
+- UPnP support using [MiniUPnP](http://miniupnp.free.fr).
 - [Revamped inspector.](https://godotengine.org/article/godot-gets-new-inspector)
   - Improved visualization and editing of numeric properties.
   - Vector and matrix types can now be edited directly (no pop-ups).
@@ -128,6 +129,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Universal translation of touch input to mouse input.
 - AudioStreamPlayer, AudioStreamPlayer2D, and AudioStreamPlayer3D now have a pitch scale property.
 - Support for MIDI input.
+- Support for audio capture from microphones.
 - `GROW_DIRECTION_BOTH` for Controls.
 - Selected tiles can be moved in the tile map editor.
 - The editor can now be configured to display the project window on the previous or next monitor (relative to the editor).
@@ -165,6 +167,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 - [Built-in vector types now use copy-on-write mode as originally intended](https://godotengine.org/article/why-we-broke-your-pr), resulting in increased engine performance.
 - The [mbedtls](https://tls.mbed.org/) library is now used instead of OpenSSL.
+- [Renamed several core files](https://github.com/godotengine/godot/pull/25821).
+  - Third-party modules may have to be updated to reflect this.
 - SSL certificates are now bundled in exported projects unless a custom bundle is specified.
 - Improved buffer writing performance on Windows and Linux.
 - Removed many debugging prints in the console.
@@ -183,10 +187,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Text editor themes are now sorted alphabetically in the selection dropdown.
 - The 3D manipulator gizmo now has a smoother, more detailed appearance.
 - The 3D viewport menu button now has a background to make it easier to read.
+- QuadMeshes are now built using two triangles (6 vertices) instead of one quad (4 vertices).
+  - This was done because quads are deprecated in OpenGL.
 - Controls inside containers are no longer movable or resizable but can still be selected.
 - The `is` GDScript keyword can now be used to compare a value against built-in types.
+- Exported variables with type hints are now always initialized.
+  - For example, `export(int) var a` will be initialized to `0`.
 - Named enums in GDScript no longer create script constants.
   - This means `enum Name { VALUE }` must now be accessed with `Name.VALUE` instead of `VALUE`.
+- Cyclic references to other scripts with `preload()` are no longer allowed.
+  - `load()` should be used in at least one of the scripts instead.
+- `switch`, `case` and `do` are no longer reserved identifiers in GDScript.
 - Shadowing variables from parent scopes is no longer allowed in GDScript.
 - Function parameters' default values can no longer depend on other parameters in GDScript.
 - Indentation guides are now displayed in a more subtle way in the script editor.
@@ -209,6 +220,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 
+- Removed the RtAudio backend on Windows in favor of WASAPI, which is the default since 3.0.
 - **macOS:** Support for 32-bit and fat binaries.
 
 ### Fixed
@@ -220,6 +232,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - The animation editor time offset indicator no longer "walks" when resizing the editor.
 - Allow creation of a built-in GDScript file even if the filename suggested already exists.
 - Show tooltips in the editor when physics object picking is disabled.
+- Button shortcuts can now be triggered by gamepad buttons.
 - Fix a serialization bug that could cause TSCN files to grow very large.
 - Gizmos are now properly hidden on scene load if the object they control is hidden.
 - Camera gizmos in the 3D viewport no longer look twice as wide as they actually are.
@@ -231,6 +244,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - The Visual Studio Code external editor option now recognizes more binary names such as `code-oss`, making detection more reliable.
 - The `-ffast-math` flag is no longer used when compiling Godot, resulting in increased floating-point determinism.
 - Fix spelling of `apply_torque_impulse()` and deprecate the misspelled method.
+- Escape sequences like `\n` and `\t` are now recognized in CSV translation files.
 - Remove spurious errors when using a PanoramaSky without textures.
 - The lightmap baker will now use all available cores on Windows.
 - Bullet physics now correctly calculates effective gravity on KinematicBodies.

CODEOWNERS

@@ -2,8 +2,6 @@
 # Each line is a file pattern followed by one or more owners.
 # Owners can be @users, @org/teams or emails
 
-/core/               @reduz
-
 /doc/                @godotengine/documentation
 doc_classes/*        @godotengine/documentation
 
@@ -22,22 +20,19 @@ doc_classes/*        @godotengine/documentation
 /drivers/winmidi/    @marcelofg55
 /drivers/xaudio2/    @marcelofg55
 
-# Porting
-/drivers/unix/       @reduz @hpvb
-/drivers/windows/    @reduz @hpvb
+/drivers/unix/       @hpvb
+/drivers/windows/    @hpvb
 
 /editor/icons/       @djrm
 
-/main/               @reduz
-
 /misc/               @akien-mga
 
 /modules/bullet/     @AndreaCatania
-/modules/csg/        @reduz @BastiaanOlij
+/modules/csg/        @BastiaanOlij
 /modules/enet/       @godotengine/network
 /modules/gdnative/   @karroffel
 /modules/gdnative/*arvr/ @BastiaanOlij
-/modules/gdscript/   @reduz @vnen @bojidar-bg
+/modules/gdscript/   @vnen @bojidar-bg
 /modules/mbedtls/    @godotengine/network
 /modules/mobile_vr/  @BastiaanOlij
 /modules/mono/       @neikeq
@@ -49,8 +44,6 @@ doc_classes/*        @godotengine/documentation
 /platform/javascript/ @eska014
 /platform/uwp/       @vnen
 
-/scene/main/         @reduz
-
 /server/physics*/    @reduz @AndreaCatania
 /server/visual*/     @reduz @karroffel
 

CONTRIBUTING.md

@@ -18,7 +18,7 @@ each of them.
 Everything referred to hereafter as "bug" also applies for feature requests.
 
 If you are reporting a new issue, you will make our life much simpler (and the
-fix come much sooner) by following those guidelines:
+fix come much sooner) by following these guidelines:
 
 #### Search first in the existing database
 
@@ -51,7 +51,7 @@ understand that:
   and then figure out why it's failing.
 
 To speed up our work, please prepare for us **a simple project** that isolates
-and reproduces the issue. This is always the **the best way for us to fix it**.
+and reproduces the issue. This is always the **best way for us to fix it**.
 You can attach a zip file with the minimal project directly to the bug report,
 by drag and dropping the file in the GitHub edition field.