diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js index 73e2cbcf1f..2b311209d4 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js @@ -12,7 +12,7 @@ // (function() { - + Script.include('../utils.js'); Script.include('../../../../examples/libraries/virtualBaton.js'); //only one person should simulate the tank at a time -- we pass around a virtual baton @@ -306,16 +306,16 @@ }; -// -// flockOfFish.js -// examples -// -// Philip Rosedale -// Copyright 2016 High Fidelity, Inc. -// Fish smimming around in a space in front of you -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html + // + // flockOfFish.js + // examples + // + // Philip Rosedale + // Copyright 2016 High Fidelity, Inc. + // Fish smimming around in a space in front of you + // + // Distributed under the Apache License, Version 2.0. + // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html var FISHTANK_USERDATA_KEY = 'hifi-home-fishtank' @@ -453,8 +453,7 @@ if (bounds !== null) { lowerCorner = bounds.brn; upperCorner = bounds.tfl; - } - else{ + } else { print('NO BOUNDS FOR TANK, returning!!') return; } @@ -715,4 +714,4 @@ } return new FishTank(); -}); +}); \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js index 2201b1a9bc..e75ed9d955 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js @@ -12,8 +12,8 @@ (function() { - -Script.include('utils.js'); + Script.include('../utils.js'); + var _this; function GrowingPlant() { diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js index bc53adf653..0cf5e3c24f 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js @@ -12,7 +12,7 @@ (function() { - Script.include('../../../../libraries/utils.js'); + Script.include('../utils.js'); var _this; function WaterSpout() { diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js index 24edbe8522..c77671d478 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js @@ -11,7 +11,7 @@ /*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */ (function() { - Script.include("utils.js"); + Script.include("../utils.js"); var SHOOTING_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/ping_pong_gun/pong_sound.wav'; var PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx';