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

Merge pull request #9313 from howard-stearns/pal

Browse source 
People Action List
This commit is contained in:
Howard Stearns 2017-01-05 15:49:56 -08:00 committed by GitHub
commit 3f54428744
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/Desktop.qml
View file

@ -76,7 +76,7 @@ OriginalDesktop.Desktop {
WebEngine.settings.localContentCanAccessRemoteUrls = true; WebEngine.settings.localContentCanAccessRemoteUrls = true;
[ // Allocate the standard buttons in the correct order. They will get images, etc., via scripts. [ // Allocate the standard buttons in the correct order. They will get images, etc., via scripts.
"hmdToggle", "mute", "mod", "bubble", "help", "hmdToggle", "mute", "pal", "bubble", "help",
"hudToggle", "hudToggle",
"com.highfidelity.interface.system.editButton", "marketplace", "snapshot", "goto" "com.highfidelity.interface.system.editButton", "marketplace", "snapshot", "goto"
].forEach(function (name) { ].forEach(function (name) {

2
scripts/defaultScripts.js
View file

@ -20,7 +20,7 @@ var DEFAULT_SCRIPTS = [
"system/hmd.js", "system/hmd.js",
"system/marketplaces/marketplace.js", "system/marketplaces/marketplace.js",
"system/edit.js", "system/edit.js",
"system/mod.js", "system/pal.js", //"system/mod.js", // older UX, if you prefer
"system/selectAudioDevice.js", "system/selectAudioDevice.js",
"system/notifications.js", "system/notifications.js",
"system/controllers/controllerDisplayManager.js", "system/controllers/controllerDisplayManager.js",

6
scripts/system/pal.js
View file

@ -11,7 +11,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
// FIXME when we make this a defaultScript: (function() { // BEGIN LOCAL_SCOPE (function() { // BEGIN LOCAL_SCOPE
Script.include("/~/system/libraries/controllers.js"); Script.include("/~/system/libraries/controllers.js");
@ -91,7 +91,7 @@ function HighlightedEntity(id, entityProperties) {
}, },
lineWidth: 1.0, lineWidth: 1.0,
ignoreRayIntersection: true, ignoreRayIntersection: true,
drawInFront: true drawInFront: false // Arguable. For now, let's not distract with mysterious wires around the scene.
}); });
HighlightedEntity.overlays.push(this); HighlightedEntity.overlays.push(this);
} }
@ -416,4 +416,4 @@ Script.scriptEnding.connect(function () {
}); });
// FIXME: }()); // END LOCAL_SCOPE }()); // END LOCAL_SCOPE