Merge upstream

.appveyor.yml

@@ -1,14 +1,19 @@
 os: Visual Studio 2015
 
 environment:
+  HOME: "%HOMEDRIVE%%HOMEPATH%"
   PYTHON: C:\Python27
+  SCONS_CACHE: "%HOME%\\scons_cache"
   matrix:
     - VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
       GD_PLATFORM: windows
       TOOLS: yes
       TARGET: release_debug
       ARCH: amd64
 
+cache:
+  - "%SCONS_CACHE%"
+
 install:
   - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - pip install --egg scons  # it will fail on AppVeyor without --egg flag

.gitignore

@@ -88,6 +88,9 @@ bld/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
+# Hints for improving IntelliSense, created together with VS project
+cpp.hint
+
 #NUNIT
 *.VisualState.xml
 TestResult.xml

.travis.yml

@@ -4,7 +4,13 @@ dist: trusty
 
 sudo: false
 
-cache: ccache
+env:
+  global:
+    - SCONS_CACHE_ROOT=$HOME/.scons_cache
+
+cache:
+  directories:
+    - $SCONS_CACHE_ROOT
 
 matrix:
   include:
@@ -20,12 +26,12 @@ matrix:
     #- env: GODOT_TARGET=windows TOOLS=yes
     #  os: linux
     #  compiler: gcc
+    - env: GODOT_TARGET=android TOOLS=no
+      os: linux
+      compiler: gcc
     - env: GODOT_TARGET=osx TOOLS=yes
       os: osx
       compiler: clang
-    #- env: GODOT_TARGET=android TOOLS=no
-    #  os: osx
-    #  compiler: clang
     #- env: GODOT_TARGET=iphone TOOLS=no
     #  os: osx
     #  compiler: clang
@@ -61,20 +67,27 @@ addons:
       # For style checks.
       - clang-format-3.9
 
-before_script:
+install:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "android" ]; then
+      misc/travis/android-tools-linux.sh;
+    fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      brew update; brew install scons ccache;
-      export PATH="/usr/local/opt/ccache/libexec:$PATH";
+      misc/travis/scons-local-osx.sh;
     fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$GODOT_TARGET" = "android" ]; then
-      brew update; brew install -v android-sdk;
-      brew install -v android-ndk | grep -v "inflating:" | grep -v "creating:";
-      export ANDROID_HOME=/usr/local/opt/android-sdk; export ANDROID_NDK_ROOT=/usr/local/opt/android-ndk;
+      misc/travis/android-tools-osx.sh;
+    fi
+
+before_script:
+  - if [ "$GODOT_TARGET" = "android" ]; then
+      export ANDROID_HOME=$TRAVIS_BUILD_DIR/godot-dev/build-tools/android-sdk;
+      export ANDROID_NDK_ROOT=$TRAVIS_BUILD_DIR/godot-dev/build-tools/android-ndk;
     fi
 
 script:
   - if [ "$STATIC_CHECKS" = "yes" ]; then
       sh ./misc/travis/clang-format.sh;
     else
+      export SCONS_CACHE=$SCONS_CACHE_ROOT/${GODOT_TARGET}-${CXX}-tools_${TOOLS}/;
       scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no;
     fi

AUTHORS.md

@@ -30,16 +30,20 @@ name is available.
     Alexander Holland (AlexHolly)
     Alexey Velikiy (jonyrock)
     Alket Rexhepi (alketii)
+    Andrea Catania (AndreaCatania)
     Andreas Haas (Hinsbart)
     Anton Yabchinskiy (a12n)
     Aren Villanueva (kurikaesu)
     Ariel Manzur (punto-)
     Bastiaan Olij (BastiaanOlij)
+    Ben Brookshire (sheepandshepherd)
+    Bernard Liebl (poke1024)
     Bojidar Marinov (bojidar-bg)
     Błażej Szczygieł (zaps166)
     Carl Olsson (not-surt)
     Dana Olson (adolson)
     Daniel J. Ramirez (djrm)
+    Дмитрий Сальников (DmitriySalnikov)
     Emmanuel Leblond (touilleMan)
     Fabio Alessandrelli (Faless)
     Ferenc Arn (tagcup)
@@ -54,6 +58,7 @@ name is available.
     Hiroshi Ogawa (hi-ogawa)
     Hubert Jarosz (Marqin)
     Hugo Locurcio (Calinou)
+    Ian (ianb96)
     Ignacio Etcheverry (neikeq)
     Indah Sylvia (ISylvox)
     J08nY
@@ -63,12 +68,14 @@ name is available.
     Juan Linietsky (reduz)
     Julian Murgia (StraToN)
     Kostadin Damyanov (Max-Might)
-    L. Krause (eska014)
+    Leon Krause (eska014)
     Marc Gilleron (Zylann)
     Marcelo Fernandez (marcelofg55)
     Mariano Javier Suligoy (MarianoGnu)
     Mario Schlack (hurikhan)
     Masoud BH (masoudbh3)
+    Matthias Hölzl (hoelzl)
+    Max Hilbrunner (mhilbrunner)
     Nathan Warden (NathanWarden)
     Nuno Donato (nunodonato)
     Ovnuniarchos
@@ -77,6 +84,7 @@ name is available.
     Pawel Kowal (pkowal1982)
     Pedro J. Estébanez (RandomShaper)
     Poommetee Ketson (Noshyaar)
+    Przemysław Gołąb (n-pigeon)
     Ralf Hölzemer (rollenrolm)
     Ramesh Ravone (RameshRavone)
     Ray Koopa (RayKoopa)

DONORS.md

@@ -17,41 +17,46 @@ None so far, but your company could be the first! :)
 ## Gold sponsors
 
     Gamblify <https://www.gamblify.com>
+    GameDev.TV <https://www.gamedev.tv>
 
 ## Mini sponsors
 
     Andreas
     Andreas Hirschauer
     Christian Uldall Pedersen
+    Christoph Woinke
     E Hewert
     Hein-Pieter van Braam
     Matthieu Huvé
     Nathan Warden
     Neal Gompa (Conan Kudo)
     Olimpiu Metiu
+    Pascal Julien
     Ruslan Mustakov
     Slobodan Milnovic
 
 ## Gold donors
 
+    3Dexplorer
     Alexander Otto
+    Andy Meier
     Asdf
-    Blair Allen
     cheese65536
     Jake Bo
     Javier
     Manuele Finocchiaro
     Officine Pixel S.n.c.
-    Ranoller
     Rémi Verschelde
     Stephan Lanfermann
 
     Andreas Schüle
     Austen McRae
     Bernhard Liebl
     Gerald E Butler
+    Jahn Johansen
     Jordan M Lucas
     Kris Michael
+    Ranoller
 
     BanjoNode2D
     Chris Serino
@@ -63,7 +68,6 @@ None so far, but your company could be the first! :)
     Henrique Alves
     Laurence Bannister
     Leo
-    mhilbrunner
     Przemysław Gołąb (n-pigeon)
     Robert Willes
     Robin Arys
@@ -72,26 +76,29 @@ None so far, but your company could be the first! :)
     Testus Maximus
     Thomas Bjarnelöf
     Xavier Tan
+    Zaq Poi
 
     Amanda Haldy
     Andreas Haas
+    Andres Cuevas
+    Arnaud Verstuyf
     Bryanna M
     Chris Brown
     Cody Parker
     D
     Ezra Theunissen
     flesk
     François Cantin
+    Giovanni Solimeno
     Hendrik Mans
     Jeppe Zapp
     Justin Arnold
     Justo Delgado Baudí
     Leandro Voltolino
     Lucien Boudy
-    Myles
     Noah
+    Ryan Estes
     Trent McPheron
-    x1212
 
 ## Silver donors
 
@@ -102,23 +109,36 @@ None so far, but your company could be the first! :)
     Avencherus
     Bastian Böhm
     Ben Vercammen
+    Blair Allen
     Bryan Stevenson
     Christian Baune
     Christian Winter
     Collin Shooltz
+    Daniel Kaplan
+    David Cravens
+    David May
+    Diego Moreira Guimarães
     Dominik Wetzel
+    Eric Martini
     Fabian Becker
     fengjiongmax
-    Fredy Romero Sam
+    Frank C. Simmons
     Geequlim
     Gerrit Großkopf
     Guldoman
+    Gustav Dahlström
+    HardRound
     hatniX
     HeartBeast
     Heribert Hirth
     Hunter Jones
+    Jaime Ruiz-Borau Vizárraga
+    Jeff Hungerford
+    Jesse Liles
+    joe513
     Jonathon
     Josh 'Cheeseness' Bush
+    Juan Negrier
     JuDelCo
     Julian Murgia
     Juraj Móza
@@ -127,24 +147,28 @@ None so far, but your company could be the first! :)
     Kevin Kamper Meejach Petersen
     Klavdij Voncina
     Kobi Malul
+    Linus Lind Lundgren
     Lisandro Lorea
     magodev
     Martin Novák
     Matthew Fitzpatrick
     Matthew Valancy
     Matthias Hölzl
     Max R.R. Collada
+    mhilbrunner
     Michael Gringauz
+    Michael Tintiuc
     Mikael Olsson
     MoM
     Moritz Laass
     nee
     Neil Blakey-Milner
     Nik Lee
     Niko Leopold
-    nvgrod
+    Oleg Tyshchenko
     Pablo Seibelt
     Pan Ip
+    Pat LaBine
     Patrick Nafarrete
     Paul Mason
     Paweł Kowal
@@ -153,17 +177,15 @@ None so far, but your company could be the first! :)
     rayos
     Richman Stewart
     Roger Smith
-    Ryan Estes
+    Roman Tinkov
     Sam Van Campenhout
-    Sam Vila
     Sasori Olkof
     Scott D. Yelich
     Sootstone
-    Tavo Tell
     TheHappieCat
     Theo Cranmore
+    Thomas Norman
     Tom Larrow
-    Troy Bonneau
     UltyX
     Wout Standaert
     Xananax & karroffel