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

2016-02-05 13:59:21 +01:00
parent 71a86cab11 ff26e1235c
commit e90f802d48
9 changed files with 157 additions and 14 deletions
@@ -6,6 +6,9 @@
      <Origin X="0" Y="0.772000015" Z="0"/>
      <Size X="1" Y="1.60000002" Z="1"/>
    </c:AABB>
+    <c:DashAbility>
+      <CoolDownMaxTimer>2.0</CoolDownMaxTimer>
+    </c:DashAbility>
    <c:Collidable/>
    <c:Health/>
    <c:Physics>