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

2016-02-10 11:37:17 +01:00
parent 3d2f9fa79d 067780c93f
commit f6a7b8ea0c
43 changed files with 1213 additions and 157 deletions
@@ -103,7 +103,7 @@ void PlayerMovementSystem::Update(double dt)
                    Events::DoubleJump e;
                    m_EventBroker->Publish(e);
                }
-                velocity.y += 4.f;
+                velocity.y = 4.f;
            }

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