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

branch update

Browse source
This commit is contained in:
Dante Ruiz 2017-01-12 20:51:25 +00:00
parent a16b229c65
commit 71083645e9
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/libraries/WebTablet.js
View file

@ -102,7 +102,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly) {
type: "Model", type: "Model",
modelURL: HOME_BUTTON_URL, modelURL: HOME_BUTTON_URL,
collisionless: true, collisionless: true,
localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: 0}, localPosition: {x: 0, y: HOME_BUTTON_Y_OFFSET, z: -0.01},
parentID: this.tabletEntityID, parentID: this.tabletEntityID,
script: Script.resolvePath("../tablet-ui/HomeButton.js") script: Script.resolvePath("../tablet-ui/HomeButton.js")
}, clientOnly); }, clientOnly);

12
scripts/system/marketplaces/marketplaces.js
View file

@ -60,8 +60,11 @@ var persistenceKey = "io.highfidelity.lastDomainTablet";
function showMarketplace() { function showMarketplace() {
tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL); tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL);
tablet.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL); UserActivityLogger.openedMarketplace();
tablet.webEventRecieved(function (message) {
// FIXME - the code to support the following is not yet implented
/*tablet.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL);
tablet.webEventRecieved.connect(function (message) {
if (message === GOTO_DIRECTORY) { if (message === GOTO_DIRECTORY) {
tablet.gotoWebScreen(MATKETPLACES_URL); tablet.gotoWebScreen(MATKETPLACES_URL);
} }
@ -74,8 +77,7 @@ function showMarketplace() {
Window.alert(NO_PERMISSIONS_ERROR_MESSAGE); Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
} }
}); });*/
UserActivityLogger.openedMarketplace();
} }
function toggleMarketplace() { function toggleMarketplace() {
@ -86,7 +88,7 @@ var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
var browseExamplesButton = tablet.addButton({ var browseExamplesButton = tablet.addButton({
icon: "icons/tablet-icons/market-i.svg", icon: "icons/tablet-icons/market-i.svg",
text: "MARKETPLACE" text: "MARKET"
}); });
function onCanWriteAssetsChanged() { function onCanWriteAssetsChanged() {