Merge branch 'WeaponSystem'

2016-02-11 23:46:23 +01:00
parent c4c53944d9 b761439c84
commit e473194671
9 changed files with 49 additions and 29 deletions
@@ -4,6 +4,8 @@ LoadMap=
 ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
 ; if false -> Use pool allocation.
 DisableMemoryPool=false
+EditorEnabled=false
+OutOfBodyExperience=false

 [Editor]
 CameraSpeed=3