Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 23:20:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13126 from birarda/67-to-master

Browse source 
merge RC67 back to master
This commit is contained in:
Stephen Birarda 2018-05-08 15:07:33 -07:00 committed by GitHub
commit a87b13c617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 height: undefined // invalidate so that the image's size sets the height
focus: true focus: true
style: OriginalStyles.ButtonStyle { background: Image {
background: Image { id: buttonImage
id: buttonImage source: "../../images/steam-sign-in.png"
source: "../../images/steam-sign-in.png"
}
} }
onClicked: signInBody.login() 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) { } else if (this.distanceRotating) {
this.distanceRotate(otherFarGrabModule); this.distanceRotate(otherFarGrabModule);
} else if (this.highlightedEntity) {
Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", this.highlightedEntity);
this.highlightedEntity = null;
} }
} }
return this.exitIfDisabled(controllerData); return this.exitIfDisabled(controllerData);

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

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