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

Merge remote-tracking branch 'upstream/master' into android_goto_splash

Browse source
This commit is contained in:
Gabriel Calero 2018-04-02 12:23:04 -03:00
commit 176038aa53
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
interface/resources/qml/AudioScope.qml → interface/resources/qml/AudioScopeUI.qml
View file

4
scripts/developer/utilities/audio/audioScope.js
View file

@ -1,4 +1,4 @@
var qml = Script.resourcesPath() + '/qml/AudioScope.qml'; var qml = Script.resourcesPath() + '/qml/AudioScopeUI.qml';
var window = new OverlayWindow({ var window = new OverlayWindow({
title: 'Audio Scope', title: 'Audio Scope',
source: qml, source: qml,
@ -14,4 +14,4 @@ window.closed.connect(function () {
AudioScope.setServerEcho(false); AudioScope.setServerEcho(false);
AudioScope.selectAudioScopeFiveFrames(); AudioScope.selectAudioScopeFiveFrames();
Script.stop(); Script.stop();
}); });

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

@ -475,7 +475,7 @@ Script.include("/~/system/libraries/Xform.js");
entityID = targetEntity.id; entityID = targetEntity.id;
targetProps = targetEntity.props; targetProps = targetEntity.props;
if (entityIsGrabbable(targetProps)) { if (entityIsGrabbable(targetProps) || entityIsGrabbable(this.targetObject.entityProps)) {
if (!entityIsDistanceGrabbable(targetProps)) { if (!entityIsDistanceGrabbable(targetProps)) {
this.targetObject.makeDynamic(); this.targetObject.makeDynamic();
} }