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

NOTE (in config file): [Debug] LoadMap=Schema/Entities/Test.xml # Conflicts: # include/Game/Game.h # src/Game/Game.cpp
2015-12-10 13:53:18 +01:00
parent 9a8f5293af dc4f5ad26e
commit d22e59f28f
35 changed files with 1092 additions and 223 deletions
@@ -1,6 +1,7 @@
 [Debug]

 LogLevel=1
+LoadMap=


 [Video]