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

2016-01-22 16:19:35 +01:00
parent 08c476e9e3 ca2aab449e
commit 74c95089ea
25 changed files with 540 additions and 181 deletions
@@ -1,11 +1,13 @@
 [Debug]
 LogLevel=1
 LoadMap=
-EditorEnabled=false
 ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
 ; if false -> Use pool allocation.
 DisableMemoryPool=false

+[Editor]
+CameraSpeed=3
+
 [Video]
 Fullscreen=false
 VSYNC=false