From 6392b7080b5dfa7f908f0639cf36638ac2e13961 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 23 Oct 2015 10:36:32 -0700 Subject: [PATCH] move scripts no longer in toybox to better locations --- examples/{entityScripts => }/breakdanceCore.js | 0 examples/{entityScripts => }/breakdanceToy.js | 2 +- examples/entityScripts/breakdanceEntity.js | 2 +- examples/{entityScripts => }/grenade.js | 0 examples/{entityScripts => }/magBalls.js | 8 ++++---- examples/{entityScripts => }/magBalls/constants.js | 0 examples/{entityScripts => }/magBalls/debugUtils.js | 0 examples/{entityScripts => }/magBalls/edgeSpring.js | 0 examples/{entityScripts => }/magBalls/graph.js | 0 examples/{entityScripts => }/magBalls/magBalls.js | 0 10 files changed, 6 insertions(+), 6 deletions(-) rename examples/{entityScripts => }/breakdanceCore.js (100%) rename examples/{entityScripts => }/breakdanceToy.js (92%) rename examples/{entityScripts => }/grenade.js (100%) rename examples/{entityScripts => }/magBalls.js (97%) rename examples/{entityScripts => }/magBalls/constants.js (100%) rename examples/{entityScripts => }/magBalls/debugUtils.js (100%) rename examples/{entityScripts => }/magBalls/edgeSpring.js (100%) rename examples/{entityScripts => }/magBalls/graph.js (100%) rename examples/{entityScripts => }/magBalls/magBalls.js (100%) diff --git a/examples/entityScripts/breakdanceCore.js b/examples/breakdanceCore.js similarity index 100% rename from examples/entityScripts/breakdanceCore.js rename to examples/breakdanceCore.js diff --git a/examples/entityScripts/breakdanceToy.js b/examples/breakdanceToy.js similarity index 92% rename from examples/entityScripts/breakdanceToy.js rename to examples/breakdanceToy.js index 0190ab74e9..d133f49ab8 100644 --- a/examples/entityScripts/breakdanceToy.js +++ b/examples/breakdanceToy.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../libraries/utils.js"); +Script.include("libraries/utils.js"); Script.include("breakdanceCore.js"); breakdanceStart(); Script.update.connect(breakdanceUpdate); diff --git a/examples/entityScripts/breakdanceEntity.js b/examples/entityScripts/breakdanceEntity.js index 5d4d418fec..8f8378c5d3 100644 --- a/examples/entityScripts/breakdanceEntity.js +++ b/examples/entityScripts/breakdanceEntity.js @@ -12,7 +12,7 @@ // (function() { - Script.include("../toys/breakdanceCore.js"); + Script.include("../breakdanceCore.js"); Script.include("../libraries/utils.js"); var _this; diff --git a/examples/entityScripts/grenade.js b/examples/grenade.js similarity index 100% rename from examples/entityScripts/grenade.js rename to examples/grenade.js diff --git a/examples/entityScripts/magBalls.js b/examples/magBalls.js similarity index 97% rename from examples/entityScripts/magBalls.js rename to examples/magBalls.js index 721e174676..c9b45164ab 100644 --- a/examples/entityScripts/magBalls.js +++ b/examples/magBalls.js @@ -7,10 +7,10 @@ // // FIXME Script paths have to be relative to the caller, in this case libraries/OmniTool.js -Script.include("../entityScripts/magBalls/constants.js"); -Script.include("../entityScripts/magBalls/graph.js"); -Script.include("../entityScripts/magBalls/edgeSpring.js"); -Script.include("../entityScripts/magBalls/magBalls.js"); +Script.include("../magBalls/constants.js"); +Script.include("../magBalls/graph.js"); +Script.include("../magBalls/edgeSpring.js"); +Script.include("../magBalls/magBalls.js"); Script.include("avatarRelativeOverlays.js"); OmniToolModuleType = "MagBallsController" diff --git a/examples/entityScripts/magBalls/constants.js b/examples/magBalls/constants.js similarity index 100% rename from examples/entityScripts/magBalls/constants.js rename to examples/magBalls/constants.js diff --git a/examples/entityScripts/magBalls/debugUtils.js b/examples/magBalls/debugUtils.js similarity index 100% rename from examples/entityScripts/magBalls/debugUtils.js rename to examples/magBalls/debugUtils.js diff --git a/examples/entityScripts/magBalls/edgeSpring.js b/examples/magBalls/edgeSpring.js similarity index 100% rename from examples/entityScripts/magBalls/edgeSpring.js rename to examples/magBalls/edgeSpring.js diff --git a/examples/entityScripts/magBalls/graph.js b/examples/magBalls/graph.js similarity index 100% rename from examples/entityScripts/magBalls/graph.js rename to examples/magBalls/graph.js diff --git a/examples/entityScripts/magBalls/magBalls.js b/examples/magBalls/magBalls.js similarity index 100% rename from examples/entityScripts/magBalls/magBalls.js rename to examples/magBalls/magBalls.js