Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #16283 from luiscuenca/fixInAirWhileSitting

Browse source 
DEV-2217: Fix MyAvatar::isInAir() so takes into account the new seated state
This commit is contained in:
Shannon Romano 2019-10-04 11:56:02 -07:00 committed by GitHub
commit 0b5299162b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/MyAvatar.cpp
View file

@ -4387,7 +4387,8 @@ bool MyAvatar::isFlying() {
bool MyAvatar::isInAir() {
// If Avatar is Hover, Falling, or Taking off, they are in Air.
return _characterController.getState() != CharacterController::State::Ground;
return _characterController.getState() != CharacterController::State::Ground &&
_characterController.getState() != CharacterController::State::Seated;
}
bool MyAvatar::getFlyingEnabled() {