Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

# Conflicts: # include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
2016-03-08 10:39:52 +01:00
parent 16124b7aa7 3436ba6656
commit ec3ed1f46f
147 changed files with 39481 additions and 3742 deletions
@@ -1,3 +1,6 @@
+[Gameplay]
+AutoReload=true
+
 [Debug]
 LogLevel=1
 LoadMap=
@@ -73,7 +76,7 @@ NumIterations=9
 TextureQuality=0

 [GLOW]
-Quality=3;
+Quality=3

 [GLOW1]
 NumIterations=5