BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	resources/Schema/Entities/NewMap.xml
This commit is contained in:
verysecrethero
2016-02-17 14:32:59 +01:00
parent ac9ce8ea83 99643fd748
commit 3e4b87da7c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Input/FirstPersonInputController.h
+2 -2
View File
@@ -202,7 +202,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
} }
//dashing with shift //dashing with shift
if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f && !isJumping) { if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
//player is dashing with shift //player is dashing with shift
//the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in! //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer; m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
@@ -227,7 +227,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
} }
m_ValidDoubleTap = false; m_ValidDoubleTap = false;
if (!(m_AssaultDashCoolDownTimer <= 0.0f && !isJumping)) { if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
//if we cant dash at the moment, then just reset the tap-sensitivity-timer //if we cant dash at the moment, then just reset the tap-sensitivity-timer
m_AssaultDashDoubleTapDeltaTime = 0.f; m_AssaultDashDoubleTapDeltaTime = 0.f;
return; return;
resources/Schema/Entities/NewMap.xml
+10 -10
View File
@@ -5019,7 +5019,7 @@
</Team> </Team>
</c:Team> </c:Team>
<c:Transform> <c:Transform>
<Position X="-60.3695679" Y="5.34500027" Z="-79.3789597"/> <Position X="-60.3695679" Y="5.64500046" Z="-79.3789597"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children> <Children>
@@ -5089,7 +5089,7 @@
</Team> </Team>
</c:Team> </c:Team>
<c:Transform> <c:Transform>
<Position X="60.0169258" Y="6.18000031" Z="76.2893906"/> <Position X="60.0169258" Y="5.78000021" Z="76.2893906"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children> <Children>
@@ -5165,7 +5165,7 @@
<c:Transform> <c:Transform>
<Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/> <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="74.9703598" Z="0"/> <Orientation X="0" Y="75.6124268" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5184,7 +5184,7 @@
<c:Transform> <c:Transform>
<Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/> <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="71.6247025" Z="0"/> <Orientation X="0" Y="72.2667694" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5203,7 +5203,7 @@
<c:Transform> <c:Transform>
<Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/> <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="69.2327347" Z="0"/> <Orientation X="0" Y="69.8748016" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5222,7 +5222,7 @@
<c:Transform> <c:Transform>
<Position X="54.7225227" Y="6.51863909" Z="29.0052128"/> <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="69.5466614" Z="0"/> <Orientation X="0" Y="70.1887283" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5241,7 +5241,7 @@
<c:Transform> <c:Transform>
<Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/> <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="68.9953842" Z="0"/> <Orientation X="0" Y="69.6374512" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5260,7 +5260,7 @@
<c:Transform> <c:Transform>
<Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/> <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="67.1246109" Z="0"/> <Orientation X="0" Y="67.7666702" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5279,7 +5279,7 @@
<c:Transform> <c:Transform>
<Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/> <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="66.1734619" Z="0"/> <Orientation X="0" Y="66.8154602" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>
@@ -5298,7 +5298,7 @@
<c:Transform> <c:Transform>
<Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/> <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
<Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/> <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
<Orientation X="0" Y="63.3846054" Z="0"/> <Orientation X="0" Y="64.0265808" Z="0"/>
</c:Transform> </c:Transform>
<c:Trigger/> <c:Trigger/>
</Components> </Components>