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

Conflicts: include/Game/BallSystem.h include/Game/ProjectileSystem.h src/game/Game/BallSystem.cpp src/game/Game/ProjectileSystem.cpp src/game/Rendering/AnimationSystem.cpp
2015-10-23 14:47:04 +02:00
parent 6206859568 9158dd8ef7
commit c1ba6481df
43 changed files with 810 additions and 439 deletions
@@ -1,6 +1,7 @@
 [Debug]
-SkipStory=false
 LogLevel=1
+SkipPreload=false
+SkipMenu=false

 [Audio]
 SFXVolume=0.5
@@ -9,4 +10,10 @@ BGMVolume=0.5
 [Video]
 Fullscreen=false
 Width=675
-Height=1080[Water]Radius=0.3[Cheat]GodMode=false[Water]Radius=0.3[Cheat]GodMode=false
+Height=1080
+
+[Water]
+Radius=0.3
+
+[Cheat]
+GodMode=false