Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12627 from samcake/workload-bis

Browse source 
Workload: Disable drawing Workload view by default
This commit is contained in:
Sam Gateau 2018-03-12 17:50:21 -07:00 committed by GitHub
commit 39edcb649d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/workload/GameWorkloadRenderer.h
View file

@ -21,7 +21,7 @@ public:
bool freezeViews{ false }; bool freezeViews{ false };
bool showProxies{ false }; bool showProxies{ false };
bool showViews{ true }; bool showViews{ false };
signals: signals:
void dirty(); void dirty();

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

@ -756,6 +756,9 @@ void CharacterController::updateState() {
SET_STATE(State::Hover, "double jump button"); SET_STATE(State::Hover, "double jump button");
} else if ((jumpButtonHeld || vertTargetSpeedIsNonZero) && (now - _jumpButtonDownStartTime) > JUMP_TO_HOVER_PERIOD) { } else if ((jumpButtonHeld || vertTargetSpeedIsNonZero) && (now - _jumpButtonDownStartTime) > JUMP_TO_HOVER_PERIOD) {
SET_STATE(State::Hover, "jump button held"); 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; break;