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

2016-02-08 10:22:35 +01:00
parent 4103c878ec 40788c7400
commit f8e514d21e
9 changed files with 33 additions and 72 deletions
@@ -13,7 +13,8 @@ A=Right,-1
 R=Reload
 Space=Jump
 LeftControl=Crouch
-LeftShift=Sprint
+RightShift=Sprint
+LeftShift=SpecialAbility
 F1=ToggleEditor
 C=ConnectToServer
 N=SwitchToServer
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Dash xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DashAbility.xsd">
+<DashAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DashAbility.xsd">
 	<CoolDownMaxTimer>2.0</CoolDownMaxTimer>
-</Dash>
+</DashAbility>
@@ -104,13 +104,6 @@
            </Entity>
            <Entity name="Weapon">
              <Components>
-                <c:ExplosionEffect>
-                  <ColorByDistance>true</ColorByDistance>
-                  <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                  <ExplosionDuration>3.7999999523162842</ExplosionDuration>
-                  <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
-                  <Randomness>true</Randomness>
-                </c:ExplosionEffect>
                <c:Model>
                  <Resource>Models/AssaultWeaponRed.mesh</Resource>
                </c:Model>