diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 141c95d0c5..f687d41fe6 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -11,6 +11,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +var TANK_SCRIPT = Script.resolvePath('tank.js?' + Math.random()); + FishTank = function(spawnPosition, spawnRotation) { var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, urchin, treasure, rocks; var CLEANUP = true; @@ -36,7 +38,7 @@ FishTank = function(spawnPosition, spawnRotation) { var TANK_POSITION = spawnPosition; - var TANK_SCRIPT = Script.resolvePath('fishTank/tank.js?' + Math.random()) + var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx"; diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 8d6061f535..bc69aff5ce 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -8,8 +8,8 @@ // This entity script handles the logic for growing a plant when it has water poured on it // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -var PLANT_SCRIPT_URL = Script.resolvePath("growingPlant/growingPlantEntityScript.js?v1" + Math.random().toFixed(2)); -var WATER_CAN_SCRIPT_URL = Script.resolvePath("growingPlant/waterCanEntityScript.js?v2" + Math.random().toFixed()); +var PLANT_SCRIPT_URL = Script.resolvePath("growingPlantEntityScript.js?v1" + Math.random().toFixed(2)); +var WATER_CAN_SCRIPT_URL = Script.resolvePath("waterCanEntityScript.js?v2" + Math.random().toFixed()); Plant = function(spawnPosition, spawnRotation) { var orientation = Camera.getOrientation(); orientation = Quat.safeEulerAngles(orientation); diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js index f155c28b41..4d8ed7ed70 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js @@ -13,7 +13,7 @@ (function() { - Script.include('../../../../libraries/utils.js'); + Script.include('../utils.js'); var SCALE = 0.5; var VICTORY_SOUND; diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js index bbed3fd55c..c62c6e7aa4 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js @@ -9,13 +9,16 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // + +var MAZE_SCRIPT = Script.resolvePath('tiltMaze/maze.js?' + Math.random()); + TiltMaze = function(spawnPosition, spawnRotation) { var ball, ballSpawningAnchor, ballDetector, tiltMaze, lightAtTheEnd; var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-4.fbx"; var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-3.obj"; - var MAZE_SCRIPT = Script.resolvePath('tiltMaze/maze.js?' + Math.random()); + var SCALE = 0.5;