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

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

Browse Source 
# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp
This commit is contained in:
verysecrethero
2016-02-03 09:52:54 +01:00
parent 7987d4b27c 24aac6a00d
commit 73ab9bb4c6
44 changed files with 544 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/PlayerMovementSystem.cpp
+7 -1
View File
@@ -81,7 +81,13 @@ void PlayerMovementSystem::Update(double dt)
}
//you cant jump and dash at the same time - since there is no friction in the air and we would thus dash much further in the air
if (!m_PlayerIsDashing && controller->Jumping() && !controller->Crouching() && velocity.y == 0.f) {
if (!m_PlayerIsDashing && 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;
}