Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam

2016-02-03 10:38:21 +01:00
parent 5e472cd69c 192de80782
commit 39653a1e4c
31 changed files with 2046 additions and 151 deletions
@@ -76,7 +76,13 @@ void PlayerMovementSystem::Update(double dt)
                ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
            }

-            if (controller->Jumping() && !controller->Crouching() && velocity.y == 0.f) {
+            if (controller->Jumping() && !controller->Crouching() && (velocity.y == 0.f || !controller->DoubleJumping())) {
+                if (velocity.y == 0.f) {
+                    controller->SetDoubleJumping(false);
+                }
+                else {
+                    controller->SetDoubleJumping(true);
+                }
                velocity.y += 4.f;
            }