Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

# Conflicts: # resources/Schema/Entities/RayAssaultBlue.xml
2016-03-13 16:45:57 +01:00
parent 3cee4e4248 041050ab2f
commit 0d287ad5d1
14 changed files with 1290 additions and 129 deletions
@@ -7,7 +7,7 @@
 	<RPM>500</RPM>
 	<Automatic>false</Automatic>
 	<ViewPunch>0.01</ViewPunch>
-	<ReloadTime>0.5</ReloadTime>
+	<ReloadTime>1.0</ReloadTime>
 	<EquipTime>0.5</EquipTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>