Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into yellow

Browse source
This commit is contained in:
Sam Gateau 2019-09-13 09:34:59 -07:00
commit f76b6da96e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/animation/src/Rig.cpp
View file

@ -1958,8 +1958,7 @@ void Rig::updateReactions(const ControllerParameters& params) {
bool isSeated = _state == RigRole::Seated; bool isSeated = _state == RigRole::Seated;
bool hipsEnabled = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Enabled; bool hipsEnabled = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Enabled;
bool hipsEstimated = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Estimated; bool hmdMode = hipsEnabled;
bool hmdMode = hipsEnabled && !hipsEstimated;
if ((reactionPlaying || isSeated) && !hmdMode) { if ((reactionPlaying || isSeated) && !hmdMode) {
// TODO: make this smooth. // TODO: make this smooth.

2
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -800,7 +800,7 @@ QUuid EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID); RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
EntityItemPointer entity; EntityItemPointer entity;
if (rayPickResult.intersects && (entity = getTree()->findEntityByID(rayPickResult.entityID))) { if (rayPickResult.intersects && (entity = getTree()->findEntityByID(rayPickResult.entityID))) {
if (!EntityTree::areEntityClicksCaptured()) { if (!EntityTree::areEntityClicksCaptured() && event->button() == Qt::MouseButton::LeftButton) {
auto properties = entity->getProperties(); auto properties = entity->getProperties();
QString urlString = properties.getHref(); QString urlString = properties.getHref();
QUrl url = QUrl(urlString, QUrl::StrictMode); QUrl url = QUrl(urlString, QUrl::StrictMode);