From d7d667c99b7c930626a7ef7fafd4bc6d8f4bc84e Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 28 Apr 2016 18:17:38 -0700 Subject: [PATCH] add utils scripts --- unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js | 3 +++ .../DomainContent/Toybox/immediateClientReset.js | 2 +- unpublishedScripts/DomainContent/Toybox/masterReset.js | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js index 061a942de9..039c350a4a 100644 --- a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js +++ b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js @@ -12,6 +12,9 @@ (function() { + var utilitiesScript = Script.resolvePath("libraries/utils.js"); + Script.include(utilitiesScript); + var _this; var gunScriptURL = Script.resolvePath("pistol/pistol.js"); diff --git a/unpublishedScripts/DomainContent/Toybox/immediateClientReset.js b/unpublishedScripts/DomainContent/Toybox/immediateClientReset.js index ee98234a26..1aa82d0249 100644 --- a/unpublishedScripts/DomainContent/Toybox/immediateClientReset.js +++ b/unpublishedScripts/DomainContent/Toybox/immediateClientReset.js @@ -6,8 +6,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -/*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, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */ +Script.include('libraries/utils.js'); var masterResetScript = Script.resolvePath("masterReset.js"); var hiddenEntityScriptURL = Script.resolvePath("hiddenEntityReset.js"); diff --git a/unpublishedScripts/DomainContent/Toybox/masterReset.js b/unpublishedScripts/DomainContent/Toybox/masterReset.js index 1460536e7d..c5fdfc1372 100644 --- a/unpublishedScripts/DomainContent/Toybox/masterReset.js +++ b/unpublishedScripts/DomainContent/Toybox/masterReset.js @@ -6,11 +6,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -/*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, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */ -//per script - -/*global deleteAllToys, createAllToys, createGates, createPingPongBallGun, createFire, createPottedPlant, createCombinedArmChair, createBasketBall, createSprayCan, createDoll, createWand, createDice, createCat, deleteAllToys, createFlashlight, createBlocks, createMagballs, createLights */ var utilitiesScript = Script.resolvePath("libraries/utils.js"); Script.include(utilitiesScript);