Merge branch 'master' into Respawning

2016-03-01 17:34:23 +01:00
parent 3d4427dd20 c60e1ba7e4
commit a9762f44ca
37 changed files with 588 additions and 271 deletions
@@ -15,6 +15,7 @@
    <c:DefenderWeapon>
      <TimeSinceLastFire>1.6944730461160304</TimeSinceLastFire>
    </c:DefenderWeapon>
+    <c:DoubleJump/>
    <c:Health/>
    <c:Physics>
      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
@@ -15,6 +15,7 @@
    <c:DefenderWeapon>
      <TimeSinceLastFire>1.6944730461160304</TimeSinceLastFire>
    </c:DefenderWeapon>
+    <c:DoubleJump/>
    <c:Health/>
    <c:Physics>
      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>