Merge branch 'master' into Respawning

# Conflicts: # resources/DefaultConfig.ini # resources/Schema/Entities/MovementTest.xml # src/Game/Systems/SoundSystem.cpp
2016-02-12 00:29:51 +01:00
parent dd131e7652 04f77da6f1
commit 11af6a3078
62 changed files with 7752 additions and 858 deletions
@@ -5,6 +5,8 @@ LoadMap=
 ; if false -> Use pool allocation.
 DisableMemoryPool=false
 RespawnTime = 8.0
+EditorEnabled=false
+OutOfBodyExperience=false

 [Editor]
 CameraSpeed=3