Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates

include/Engine/Input/FirstPersonInputController.h

@@ -202,7 +202,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
 
     //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f && !isJumping) {
+    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
         //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!
         m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
@@ -227,7 +227,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     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
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;

resources/Schema/Entities/AmmoPickup.xml

@@ -5,10 +5,15 @@
     <c:AABB/>
     <c:AmmoPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/HealthPickup.xml

@@ -5,10 +5,15 @@
     <c:AABB/>
     <c:HealthPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/NewMap.xml

@@ -5019,7 +5019,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.3695679" Y="2.14482641" Z="-79.3789597"/>
+          <Position X="-60.3695679" Y="5.64500046" Z="-79.3789597"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5089,7 +5089,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="60.0169258" Y="2.37972379" Z="76.2893906"/>
+          <Position X="60.0169258" Y="5.78000021" Z="76.2893906"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5165,7 +5165,7 @@
             <c:Transform>
               <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="71.4059677" Z="0"/>
+              <Orientation X="0" Y="75.6124268" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5184,7 +5184,7 @@
             <c:Transform>
               <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="68.0603104" Z="0"/>
+              <Orientation X="0" Y="72.2667694" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5203,7 +5203,7 @@
             <c:Transform>
               <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.6683426" Z="0"/>
+              <Orientation X="0" Y="69.8748016" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5222,7 +5222,7 @@
             <c:Transform>
               <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.9822693" Z="0"/>
+              <Orientation X="0" Y="70.1887283" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5241,7 +5241,7 @@
             <c:Transform>
               <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.4309921" Z="0"/>
+              <Orientation X="0" Y="69.6374512" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5260,7 +5260,7 @@
             <c:Transform>
               <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="63.560215" Z="0"/>
+              <Orientation X="0" Y="67.7666702" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5279,7 +5279,7 @@
             <c:Transform>
               <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="62.6090584" Z="0"/>
+              <Orientation X="0" Y="66.8154602" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5298,7 +5298,7 @@
             <c:Transform>
               <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="59.8201942" Z="0"/>
+              <Orientation X="0" Y="64.0265808" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>

src/Engine/Editor/EditorSystem.cpp

@@ -43,6 +43,8 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_Enabled = ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.EditorEnabled", false);
     if (m_Enabled) {
         Enable();
+    } else {
+        Disable();
     }
 }