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

Remove from default scripts

Browse source
This commit is contained in:
Zach Fox 2017-07-12 14:24:23 -07:00
parent 63b0e70833
commit d37789234d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/defaultScripts.js
View file

@ -25,7 +25,6 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/tablet-goto.js", "system/tablet-goto.js",
"system/marketplaces/marketplaces.js", "system/marketplaces/marketplaces.js",
"system/edit.js", "system/edit.js",
"system/spectatorCamera.js",
"system/notifications.js", "system/notifications.js",
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",

4
unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -157,7 +157,7 @@
if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) { if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) {
button = tablet.addButton({ button = tablet.addButton({
text: buttonName, text: buttonName,
icon: "icons/tablet-icons/spectator-i.svg" icon: Script.resourcesPath() + "icons/tablet-icons/spectator-i.svg"
}); });
button.clicked.connect(onTabletButtonClicked); button.clicked.connect(onTabletButtonClicked);
} }
@ -383,7 +383,7 @@
// Relevant Variables: // Relevant Variables:
// -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML // -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML
// -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app. // -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app.
var SPECTATOR_CAMERA_QML_SOURCE = "../SpectatorCamera.qml"; var SPECTATOR_CAMERA_QML_SOURCE = Script.resourcesPath() + "qml/hifi/SpectatorCamera.qml";
var onSpectatorCameraScreen = false; var onSpectatorCameraScreen = false;
function onTabletButtonClicked() { function onTabletButtonClicked() {
if (!tablet) { if (!tablet) {