Better file dialogue

.appveyor.yml

@@ -7,20 +7,27 @@ environment:
   PYTHON: C:\Python38
   SCONS_CACHE_ROOT: "%HOME%\\scons_cache"
   SCONS_CACHE_LIMIT: 1024
+  OPTIONS: "debug_symbols=no verbose=yes progress=no"
+  EXTRA_ARGS: "warnings=all werror=yes"
   matrix:
-    - GD_PLATFORM: windows
-      TOOLS: yes
-      TARGET: release_debug
+  - GD_PLATFORM: windows
+    TARGET: release_debug
+    TOOLS: yes
+
+matrix:
+  fast_finish: true
 
 init:
-  - ps: if ($env:APPVEYOR_REPO_BRANCH -ne "master") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" }
+  - ps: if ($env:APPVEYOR_REPO_BRANCH -ne "3.2") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" }
 
 cache:
   - "%SCONS_CACHE_ROOT%"
 
 install:
   - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - pip install scons==3.1.2
+  - pip install -U wheel  # needed for pip install scons to work, otherwise a flag is missing
+  - pip install scons # use stable scons
+  - if defined VS call "%VS%" %ARCH%  # if defined - so we can also use mingw
 
 before_build:
   - echo %GD_PLATFORM%
@@ -29,4 +36,16 @@ before_build:
   - set "SCONS_CACHE=%SCONS_CACHE_ROOT%\%APPVEYOR_REPO_BRANCH%"
 
 build_script:
-  - scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% debug_symbols=no verbose=yes progress=no gdnative_wrapper=yes
+  - scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% %OPTIONS% %EXTRA_ARGS%
+
+after_build:
+  - git rev-parse --short=9 HEAD > VERSION_HASH.txt
+  - set /P VERSION_HASH= < VERSION_HASH.txt
+  - cd bin
+  - mv godot.windows.opt.tools.64.exe godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.exe
+  - 7z a -mx9 godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.zip *.exe
+
+artifacts:
+  - path: bin/godot_${APPVEYOR_REPO_BRANCH}-${VERSION_HASH}_win64.zip
+    name: Win64 release_debug editor build
+    type: zip

.clang-format

@@ -124,4 +124,5 @@ ObjCBlockIndentWidth: 4
 ### Java specific config ###
 Language:        Java
 # BreakAfterJavaFieldAnnotations: false
+JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
 ...

.editorconfig

@@ -9,6 +9,10 @@ insert_final_newline = true
 [*.{cpp,hpp,c,h,mm}]
 trim_trailing_whitespace = true
 
+[{*.gradle,AndroidManifest.xml}]
+indent_style = space
+indent_size = 4
+
 [{*.{py,cs},SConstruct,SCsub}]
 indent_style = space
 indent_size = 4

.gitignore

@@ -18,8 +18,9 @@ local.properties
 .idea
 .gradletasknamecache
 project.properties
+platform/android/java/app/libs/*
 platform/android/java/libs/*
-platform/android/java/assets
+platform/android/java/lib/.cxx/
 
 # General c++ generated files
 *.lib
@@ -53,6 +54,11 @@ gmon.out
 *.cflags
 *.cxxflags
 
+# Code::Blocks files
+*.cbp
+*.layout
+*.depend
+
 # Eclipse CDT files
 .cproject
 .settings/
@@ -87,6 +93,9 @@ logs/
 *.sln
 *.vcxproj*
 
+# Custom SCons configuration override
+/custom.py
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -335,6 +344,9 @@ platform/windows/godot_res.res
 # Visual Studio Code workspace file
 *.code-workspace
 
+# Scons construction environment dump
+.scons_env.json
+
 # Scons progress indicator
 .scons_node_count
 

.mailmap

@@ -24,7 +24,10 @@ Chris Bradfield <[email protected]> <[email protected]>
 Clay John <[email protected]>
 Clay John <[email protected]> <[email protected]>
 Dana Olson <[email protected]> <[email protected]>
+dankan1890 <[email protected]>
 Daniel J. Ramirez <[email protected]>
+Dominik 'dreamsComeTrue' Jasiński <[email protected]>
+Emmanuel Barroga <[email protected]>
 Erik Selecký <[email protected]>
 Erik Selecký <[email protected]> <[email protected]>
 Fabian <[email protected]>
@@ -73,6 +76,7 @@ Mariano Javier Suligoy <[email protected]>
 Mario Schlack <[email protected]>
 marxin <[email protected]>
 marynate <[email protected]> <[email protected]>
+Mateo Kuruk Miccino <[email protected]>
 Max Hilbrunner <[email protected]>
 Max Hilbrunner <[email protected]> <[email protected]>
 Michael Alexsander <[email protected]>

.travis.yml

@@ -72,12 +72,22 @@ matrix:
       env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes"
       os: osx
       compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - scons
+          update: true
 
     - name: iOS export template (debug, Clang)
       stage: build
       env: PLATFORM=iphone TOOLS=no TARGET=debug CACHE_NAME=${PLATFORM}-clang
       os: osx
       compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - scons
+          update: true
 
     - name: Linux headless editor (release_debug, GCC 9, testing project exporting and script running)
       stage: build
@@ -104,20 +114,22 @@ matrix:
 
 before_install:
   - eval "${MATRIX_EVAL}"
-  - if [ "$STATIC_CHECKS" = "yes" ]; then
-      unset SCONS_CACHE;
-    fi
 
 install:
-  - pip install --user scons;
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      pyenv global 3.7.1 system;
+      pip3 install --user scons;
+    fi
+  - scons --version
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$PLATFORM" = "android" ]; then
       export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64;
       export PATH=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:${PATH};
       java -version;
       misc/travis/android-tools-linux.sh;
     fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      export PATH=${PATH}:/Users/travis/Library/Python/2.7/bin;
+  - if [ "$STATIC_CHECKS" = "yes" ]; then
+      unset SCONS_CACHE;
+      pip3 install --user black pygments;
     fi
 
 before_script:
@@ -129,6 +141,7 @@ before_script:
 script:
   - if [ "$STATIC_CHECKS" = "yes" ]; then
       sh ./misc/travis/clang-format.sh &&
+      sh ./misc/travis/black-format.sh &&
       doc/tools/makerst.py --dry-run doc/classes modules;
     else
       scons -j2 CC=$CC CXX=$CXX platform=$PLATFORM tools=$TOOLS target=$TARGET $OPTIONS $EXTRA_ARGS &&

AUTHORS.md

@@ -61,6 +61,7 @@ name is available.
     David Sichma (DavidSichma)
     Dharkael (lupoDharkael)
     Dmitry Koteroff (Krakean)
+    Dominik Jasiński (dreamsComeTrue)
     DualMatrix
     Emmanuel Barroga (codecustard)
     Emmanuel Leblond (touilleMan)
@@ -94,6 +95,7 @@ name is available.
     Indah Sylvia (ISylvox)
     J08nY
     Jakub Grzesik (kubecz3k)
+    James Buck (jbuck3)
     Jérôme Gully (Nutriz)
     Joan Fons Sanchez (JFonS)
     Johan Manuel (29jm)
@@ -104,6 +106,7 @@ name is available.
     Kelly Thomas (KellyThomas)
     Kostadin Damyanov (Max-Might)
     K. S. Ernest (iFire) Lee (fire)
+    lawnjelly
     Leon Krause (eska014)
     Lucien Menassol (Kanabenki)
     m4nu3lf
@@ -118,12 +121,14 @@ name is available.
     Martin Sjursen (binbitten)
     marynate
     Masoud BH (masoudbh3)
+    Mateo Kuruk Miccino (kuruk-mm)
     Matthias Hölzl (hoelzl)
     Max Hilbrunner (mhilbrunner)
     merumelu
     Michael Alexsander (YeldhamDev)
     MichiRecRoom (LikeLakers2)
     mrezai
+    muiroc
     Nathan Warden (NathanWarden)
     Nils André-Chang (NilsIrl)
     Nuno Donato (nunodonato)
@@ -156,6 +161,7 @@ name is available.
     Shiqing (kawa-yoiko)
     Simon Wenner (swenner)
     Swarnim Arun (minraws)
+    Thakee Nathees (ThakeeNathees)
     Theo Hallenius (TheoXD)
     Thomas Herzog (karroffel)
     Timo Schwarzer (timoschwarzer)

CHANGELOG.md

@@ -250,6 +250,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Drag-and-drop support in the TileSet editor.
 - Ability to attach scripts to nodes by dragging a name from the script list to a node in the scene tree.
 - Icons are now displayed next to code completion items, making their type easier to distinguish.
+- TileMap property `centered_textures` can be used to center textures on their tile, instead of using the tile's top-left corner as position for the texture.
 - "Ignore" flag to ignore specific tiles when autotiling in the TileMap editor.
 - Keyboard shortcuts to rotate tiles in the TileMap editor.
   - Default shortcuts are <kbd>A</kbd> (rotate left), <kbd>S</kbd> (rotate right), <kbd>X</kbd> (flip horizontally), <kbd>Y</kbd> (flip vertically).
@@ -519,6 +520,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - Graph lines are now thinner and opaque.
   - Graph line widths are now resized to match the editor scale.
   - Rounded values now display trailing zeroes to make their precision clearer.
+- TileMap support for transform operations on cell textures bigger than the cell size has been reworked to properly support isometric tiles.
+  - Breaks compatibility with some TileMaps from previous Godot versions. An opt-in `compatibility_mode` property can be used to restore the previous behavior.
 - Some TileMap editor options were moved to the toolbar.
 - The TileMap editor now displays coordinate information in the 2D viewport's bottom-left corner.
   - This fixes the TileMap editor width changing when hovering tiles in a small window.