Merge pull request #82 from teamfisk/BoxModelCollision

Small fixes to collision/trigger-boxes, etc.
2016-02-10 10:08:54 +01:00
parent 5987751add 830e0f66c9
commit 90192e016a
12 changed files with 74 additions and 51 deletions
@@ -95,7 +95,7 @@ void PlayerMovementSystem::Update(double dt)
                } else {
                    controller->SetDoubleJumping(true);
                }
-                velocity.y += 4.f;
+                velocity.y = 4.f;
            }

            if (player.HasComponent("AABB")) {