Showing the changes to scripts/system/controllers/controllerScripts.js (1 of 6 files). Show all
Unified · Split
| @@ -11,13 +11,15 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | /* global Script, Menu */ |
| 13 | 13 | |
| 14 | +Script.include("controllerDispatcher.js"); | |
| 15 | + | |
| 14 | 16 | var CONTOLLER_SCRIPTS = [ |
| 15 | 17 | "squeezeHands.js", |
| 16 | 18 | "controllerDisplayManager.js", |
| 17 | 19 | "grab.js", |
| 18 | 20 | //"toggleAdvancedMovementForHandControllers.js", |
| 19 | 21 | "handTouch.js", |
| 20 | − "controllerDispatcher.js", | |
| 22 | + //"controllerDispatcher.js", | |
| 21 | 23 | "controllerModules/nearParentGrabOverlay.js", |
| 22 | 24 | "controllerModules/stylusInput.js", |
| 23 | 25 | "controllerModules/equipEntity.js", |
| @@ -44,6 +46,7 @@ var DEBUG_MENU_ITEM = "Debug defaultScripts.js"; · 20 unmodified lines | ||
| 44 | 46 | function runDefaultsTogether() { |
| 45 | 47 | for (var j in CONTOLLER_SCRIPTS) { |
| 46 | 48 | if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) { |
| 49 | + print("including " + CONTOLLER_SCRIPTS[j]); | |
| 47 | 50 | Script.include(CONTOLLER_SCRIPTS[j]); |
| 48 | 51 | } |
| 49 | 52 | } |
| @@ -52,6 +55,7 @@ function runDefaultsTogether() { · 2 unmodified lines | ||
| 52 | 55 | function runDefaultsSeparately() { |
| 53 | 56 | for (var i in CONTOLLER_SCRIPTS) { |
| 54 | 57 | if (CONTOLLER_SCRIPTS.hasOwnProperty(i)) { |
| 58 | + print("loading " + CONTOLLER_SCRIPTS[j]); | |
| 55 | 59 | Script.load(CONTOLLER_SCRIPTS[i]); |
| 56 | 60 | } |
| 57 | 61 | } |