Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master

Browse source
This commit is contained in:
Stephen Birarda 2018-05-08 14:08:21 -07:00
commit 4165ab3667
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/LoginDialog/SignInBody.qml
View file

@ -84,11 +84,9 @@ Item {
height: undefined // invalidate so that the image's size sets the height
focus: true
style: OriginalStyles.ButtonStyle {
background: Image {
id: buttonImage
source: "../../images/steam-sign-in.png"
}
background: Image {
id: buttonImage
source: "../../images/steam-sign-in.png"
}
onClicked: signInBody.login()
}

3
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -564,6 +564,9 @@ Script.include("/~/system/libraries/Xform.js");
}
} else if (this.distanceRotating) {
this.distanceRotate(otherFarGrabModule);
} else if (this.highlightedEntity) {
Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", this.highlightedEntity);
this.highlightedEntity = null;
}
}
return this.exitIfDisabled(controllerData);

3
scripts/system/controllers/controllerModules/mouseHighlightEntities.js
View file

@ -63,6 +63,9 @@
this.highlightedEntity = targetEntityID;
}
}
} else if (this.highlightedEntity) {
dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity);
this.highlightedEntity = null;
}
}