Showing the changes to scripts/system/controllers/controllerScripts.js (1 of 1002 files). Show all
Unified · Split
| @@ -32,22 +32,13 @@ var CONTOLLER_SCRIPTS = [ · 31 unmodified lines | |||
| 32 | "controllerModules/mouseHMD.js", | 32 | "controllerModules/mouseHMD.js", |
| 33 | "controllerModules/scaleEntity.js", | 33 | "controllerModules/scaleEntity.js", |
| 34 | "controllerModules/nearGrabHyperLinkEntity.js", | 34 | "controllerModules/nearGrabHyperLinkEntity.js", |
| 35 | "controllerModules/nearTabletHighlight.js" | 35 | "controllerModules/nearTabletHighlight.js", |
| 36 | "controllerModules/nearGrabEntity.js", | ||
| 37 | "controllerModules/farGrabEntity.js" | ||
| 36 | ]; | 38 | ]; |
| 37 | 39 | ||
| 38 | if (Settings.getValue("useTraitsGrab", true)) { | ||
| 39 | CONTOLLER_SCRIPTS.push("controllerModules/nearGrabEntity.js"); | ||
| 40 | CONTOLLER_SCRIPTS.push("controllerModules/farGrabEntity.js"); | ||
| 41 | } else { | ||
| 42 | CONTOLLER_SCRIPTS.push("controllerModules/nearParentGrabEntity.js"); | ||
| 43 | CONTOLLER_SCRIPTS.push("controllerModules/nearActionGrabEntity.js"); | ||
| 44 | CONTOLLER_SCRIPTS.push("controllerModules/farActionGrabEntityDynOnly.js"); | ||
| 45 | CONTOLLER_SCRIPTS.push("controllerModules/farParentGrabEntity.js"); | ||
| 46 | } | ||
| 47 | |||
| 48 | var DEBUG_MENU_ITEM = "Debug defaultScripts.js"; | 40 | var DEBUG_MENU_ITEM = "Debug defaultScripts.js"; |
| 49 | 41 | ||
| 50 | |||
| 51 | function runDefaultsTogether() { | 42 | function runDefaultsTogether() { |
| 52 | for (var j in CONTOLLER_SCRIPTS) { | 43 | for (var j in CONTOLLER_SCRIPTS) { |
| 53 | if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) { | 44 | if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) { |