Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-08 18:42:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12616 from NissimHadar/bug12435

Browse source 
Mitigation of Manuscript issue 12435
This commit is contained in:
John Conklin II 2018-03-12 12:01:42 -07:00 committed by GitHub
commit 1c403b7532
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/physics/src/CharacterController.cpp
View file

@ -756,6 +756,9 @@ void CharacterController::updateState() {
SET_STATE(State::Hover, "double jump button");
} else if ((jumpButtonHeld || vertTargetSpeedIsNonZero) && (now - _jumpButtonDownStartTime) > JUMP_TO_HOVER_PERIOD) {
SET_STATE(State::Hover, "jump button held");
} else if (_floorDistance > _scaleFactor * DEFAULT_AVATAR_FALL_HEIGHT) {
// Transition to hover if we are above the fall threshold
SET_STATE(State::Hover, "above fall threshold");
}
}
break;