Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
David Kelly 2017-01-05 18:30:28 -07:00
commit 88ed96918a
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

@ -23,7 +23,7 @@ const SELECTED_TEXTURES = { "idle-D": Script.resolvePath("./assets/models/Avatar
const UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6}; const UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6};
const SELECTED_COLOR = {red: 0xf3, green: 0x91, blue: 0x29}; const SELECTED_COLOR = {red: 0xf3, green: 0x91, blue: 0x29};
// 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");
@ -124,7 +124,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);
} }
@ -475,4 +475,4 @@ Script.scriptEnding.connect(function () {
}); });
// FIXME: }()); // END LOCAL_SCOPE }()); // END LOCAL_SCOPE