Merge remote-tracking branch 'origin/master' into Networking

# Conflicts: # src/Game/Game.cpp
2015-12-17 14:10:02 +01:00
parent 4bb4e29515 1a9b765d47
commit 50822d09fc
16 changed files with 426 additions and 62 deletions
@@ -2,6 +2,7 @@

 LogLevel=1
 LoadMap=
+EditorEnabled=false


 [Video]