Merge pull request #17 from hungrymonkey/voip2

Voip2

.gitattributes

@@ -8,3 +8,4 @@ drivers/* linguist-vendored
 *.h eol=lf
 *.py eol=lf
 *.hpp eol=lf
+*.xml eol=lf

.travis.yml

@@ -6,45 +6,29 @@ sudo: false
 
 cache: ccache
 
-compiler:
-  - gcc
-  - clang
-
-os:
-  - linux
-  - osx
-
-env:
-  - GODOT_TARGET=iphone
-  - GODOT_TARGET=osx
-  - GODOT_TARGET=x11
-  #- GODOT_TARGET=android
-  #- GODOT_TARGET=windows
-
 matrix:
   include:
     - env: STATIC_CHECKS=yes
-  exclude:
-    - os: linux
-      env: GODOT_TARGET=iphone
-    - os: linux
-      env: GODOT_TARGET=osx
-    - os: linux
-      env: GODOT_TARGET=android
-    - os: osx
-      env: GODOT_TARGET=x11
-    - os: osx
-      env: GODOT_TARGET=windows
-    - compiler: gcc
-      env: GODOT_TARGET=iphone
-    - compiler: gcc
-      env: GODOT_TARGET=osx
-    - compiler: clang
-      env: GODOT_TARGET=android
-    - compiler: clang
-      env: GODOT_TARGET=windows
-    - compiler: clang
-      env: GODOT_TARGET=x11
+      os: linux
+      compiler: clang
+    - env: GODOT_TARGET=x11 TOOLS=yes
+      os: linux
+      compiler: gcc
+    - env: GODOT_TARGET=x11 TOOLS=no
+      os: linux
+      compiler: clang
+    #- env: GODOT_TARGET=windows TOOLS=yes
+    #  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
 
 addons:
   apt:
@@ -92,5 +76,5 @@ script:
   - if [ "$STATIC_CHECKS" = "yes" ]; then
       sh ./misc/travis/clang-format.sh;
     else
-      scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX;
+      scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no;
     fi

AUTHORS.md

@@ -47,9 +47,11 @@ name is available.
     Geequlim
     Gen (dbsGen)
     George Marques (vnen)
+    Gerrit Großkopf (Grosskopf)
     Gilles Roudiere (groud)
     Guilherme Felipe (guilhermefelipecgs)
     Hein-Pieter van Braam (hpvb)
+    Hiroshi Ogawa (hi-ogawa)
     Hubert Jarosz (Marqin)
     Hugo Locurcio (Calinou)
     Ignacio Etcheverry (neikeq)

CONTRIBUTING.md

@@ -87,7 +87,7 @@ rebase -i`` and relevant help about rebasing or ammending commits on the
 Internet).
 
 This git style guide has some good practices to have in mind:
-https://github.com/agis-/git-style-guide
+[Git Style Guide](https://github.com/agis-/git-style-guide)
 
 #### Format your commit logs with readability in mind
 

DONORS.md

@@ -20,28 +20,38 @@ None so far, but your company could be the first! :)
 
 ## Mini sponsors
 
-    Arron Washington
-    Chris Phyffer
+    Andreas
+    Andreas Hirschauer
     Christian Uldall Pedersen
+    E Hewert
     Hein-Pieter van Braam
     Matthieu Huvé
+    Nathan Warden
     Neal Gompa (Conan Kudo)
     Olimpiu Metiu
     Ruslan Mustakov
+    Slobodan Milnovic
 
 ## Gold donors
 
     Alexander Otto
+    Asdf
+    Blair Allen
+    cheese65536
     Jake Bo
     Javier
-    Nathan Warden
+    Manuele Finocchiaro
+    Officine Pixel S.n.c.
     Ranoller
     Rémi Verschelde
     Stephan Lanfermann
 
     Andreas Schüle
+    Austen McRae
     Bernhard Liebl
+    Gerald E Butler
     Jordan M Lucas
+    Kris Michael
 
     BanjoNode2D
     Chris Serino
@@ -53,57 +63,70 @@ 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
+    ScottMakesGames
     summerblind
     Testus Maximus
     Thomas Bjarnelöf
+    Xavier Tan
 
     Amanda Haldy
     Andreas Haas
     Bryanna M
+    Chris Brown
     Cody Parker
     D
     Ezra Theunissen
     flesk
     François Cantin
     Hendrik Mans
     Jeppe Zapp
-    Johannes Wuensch
     Justin Arnold
     Justo Delgado Baudí
     Leandro Voltolino
+    Lucien Boudy
     Myles
-    Robert Podgorski
-    Scott Beacon
+    Noah
+    Trent McPheron
     x1212
 
 ## Silver donors
 
+    1D_Inc
+    Alessandro Senese
     Alex Barsukov
+    Anthony Bongiovanni
     Avencherus
     Bastian Böhm
     Ben Vercammen
     Bryan Stevenson
+    Christian Baune
+    Christian Winter
     Collin Shooltz
+    Dominik Wetzel
     Fabian Becker
     fengjiongmax
+    Fredy Romero Sam
     Geequlim
     Gerrit Großkopf
     Guldoman
     hatniX
     HeartBeast
     Heribert Hirth
     Hunter Jones
-    imekon
-    Jacob McKenney
     Jonathon
     Josh 'Cheeseness' Bush
+    JuDelCo
     Julian Murgia
     Juraj Móza
+    KC Chan
     Kevin Boyer
+    Kevin Kamper Meejach Petersen
     Klavdij Voncina
+    Kobi Malul
     Lisandro Lorea
     magodev
     Martin Novák
@@ -113,26 +136,36 @@ None so far, but your company could be the first! :)
     Max R.R. Collada
     Michael Gringauz
     Mikael Olsson
+    MoM
     Moritz Laass
     nee
+    Neil Blakey-Milner
+    Nik Lee
+    Niko Leopold
     nvgrod
     Pablo Seibelt
     Pan Ip
+    Patrick Nafarrete
     Paul Mason
     Paweł Kowal
+    Pete Goodwin
     Pietro Vertechi
     rayos
     Richman Stewart
     Roger Smith
+    Ryan Estes
     Sam Van Campenhout
     Sam Vila
     Sasori Olkof
+    Scott D. Yelich
     Sootstone
     Tavo Tell
+    TheHappieCat
+    Theo Cranmore
     Tom Larrow
-    Trent McPheron
     Troy Bonneau
     UltyX
+    Wout Standaert
     Xananax & karroffel
 
 ## Bronze donors

LICENSE.txt

@@ -18,5 +18,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
--- Godot Engine <https://godotengine.org>

README.md

@@ -26,6 +26,8 @@ Before being open sourced in February 2014, Godot had been developed by Juan
 Linietsky and Ariel Manzur (both still maintaining the project) for several
 years as an in-house engine, used to publish several work-for-hire titles.
 
+![Screenshot of a 3D scene in Godot Engine](http://download.tuxfamily.org/godotengine/media/screenshots/editor_3d_fracteed.jpg)
+
 ### Getting the engine
 
 #### Binary downloads

SConstruct

@@ -11,7 +11,8 @@ import glob
 import sys
 import methods
 
-methods.update_version()
+# moved below to compensate with module version string
+# methods.update_version()
 
 # scan possible build platforms
 
@@ -72,6 +73,7 @@ env_base.AppendENVPath('PATH', os.getenv('PATH'))
 env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
 env_base.global_defaults = global_defaults
 env_base.android_maven_repos = []
+env_base.android_flat_dirs = []
 env_base.android_dependencies = []
 env_base.android_gradle_plugins = []
 env_base.android_gradle_classpath = []
@@ -86,6 +88,7 @@ env_base.android_appattributes_chunk = ""
 env_base.disabled_modules = []
 env_base.use_ptrcall = False
 env_base.split_drivers = False
+env_base.module_version_string = ""
 
 # To decide whether to rebuild a file, use the MD5 sum only if the timestamp has changed.
 # http://scons.org/doc/production/HTML/scons-user/ch06.html#idm139837621851792
@@ -96,6 +99,7 @@ env_base.SetOption('implicit_cache', 1)
 
 
 env_base.__class__.android_add_maven_repository = methods.android_add_maven_repository
+env_base.__class__.android_add_flat_dir = methods.android_add_flat_dir
 env_base.__class__.android_add_dependency = methods.android_add_dependency
 env_base.__class__.android_add_java_dir = methods.android_add_java_dir
 env_base.__class__.android_add_res_dir = methods.android_add_res_dir
@@ -109,6 +113,8 @@ env_base.__class__.android_add_gradle_plugin = methods.android_add_gradle_plugin
 env_base.__class__.android_add_gradle_classpath = methods.android_add_gradle_classpath
 env_base.__class__.disable_module = methods.disable_module
 
+env_base.__class__.add_module_version_string = methods.add_module_version_string
+
 env_base.__class__.add_source_files = methods.add_source_files
 env_base.__class__.use_windows_spawn_fix = methods.use_windows_spawn_fix
 env_base.__class__.split_lib = methods.split_lib
@@ -137,6 +143,7 @@ opts.Add('p', "Platform (alias for 'platform')", '')
 opts.Add('platform', "Target platform (%s)" % ('|'.join(platform_list), ), '')
 opts.Add(EnumVariable('target', "Compilation target", 'debug', ('debug', 'release_debug', 'release')))
 opts.Add(BoolVariable('tools', "Build the tools a.k.a. the Godot editor", True))
+opts.Add(BoolVariable('use_lto', 'Use linking time optimization', False))
 
 # Components
 opts.Add(BoolVariable('deprecated', "Enable deprecated features", True))
@@ -356,11 +363,6 @@ if selected_platform in platform_list:
 
     suffix += env.extra_suffix
 
-    env["PROGSUFFIX"] = suffix + env["PROGSUFFIX"]
-    env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"]
-    env["LIBSUFFIX"] = suffix + env["LIBSUFFIX"]
-    env["SHLIBSUFFIX"] = suffix + env["SHLIBSUFFIX"]
-
     sys.path.remove("./platform/" + selected_platform)
     sys.modules.pop('detect')
 
@@ -389,6 +391,15 @@ if selected_platform in platform_list:
         sys.path.remove(tmppath)
         sys.modules.pop('config')
 
+    methods.update_version(env.module_version_string)
+
+    suffix += env.module_version_string
+
+    env["PROGSUFFIX"] = suffix + env["PROGSUFFIX"]
+    env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"]
+    env["LIBSUFFIX"] = suffix + env["LIBSUFFIX"]
+    env["SHLIBSUFFIX"] = suffix + env["SHLIBSUFFIX"]
+
     if (env.use_ptrcall):
         env.Append(CPPFLAGS=['-DPTRCALL_ENABLED'])
 

compat.py

@@ -12,6 +12,8 @@ def StringIO():
         return cStringIO.StringIO()
     def encode_utf8(x):
         return x
+    def decode_utf8(x):
+        return x
     def iteritems(d):
         return d.iteritems()
     def escape_string(s):
@@ -38,6 +40,8 @@ def StringIO():
     import codecs
     def encode_utf8(x):
         return codecs.utf_8_encode(x)[0]
+    def decode_utf8(x):
+        return codecs.utf_8_decode(x)[0]
     def iteritems(d):
         return iter(d.items())
     def charcode_to_c_escapes(c):