History

working on fix

druiz17 committed 9 years ago

Commit 53efe6b1 parent 4f328529 files · +337 −20Browse files

Showing the changes to scripts/system/controllers/controllerScripts.js (1 of 9 files). Show all

Unified · Split

scripts/system/controllers/controllerScripts.js+4−3
@@ -12,14 +12,14 @@ · 11 unmodified lines
12var CONTOLLER_SCRIPTS = [12var CONTOLLER_SCRIPTS = [
13 "squeezeHands.js",13 "squeezeHands.js",
14 "controllerDisplayManager.js",14 "controllerDisplayManager.js",
15 "handControllerPointer.js",15 //"handControllerPointer.js",
16 "grab.js",16 "grab.js",
17 "toggleAdvancedMovementForHandControllers.js",17 "toggleAdvancedMovementForHandControllers.js",
18 "controllerDispatcher.js",18 "controllerDispatcher.js",
19 "controllerModules/nearParentGrabEntity.js",19 "controllerModules/nearParentGrabEntity.js",
20 "controllerModules/nearParentGrabOverlay.js",20 "controllerModules/nearParentGrabOverlay.js",
21 "controllerModules/nearActionGrabEntity.js",21 "controllerModules/nearActionGrabEntity.js",
22 "controllerModules/farActionGrabEntity.js",22 //"controllerModules/farActionGrabEntity.js",
23 "controllerModules/tabletStylusInput.js",23 "controllerModules/tabletStylusInput.js",
24 "controllerModules/equipEntity.js",24 "controllerModules/equipEntity.js",
25 "controllerModules/nearTrigger.js",25 "controllerModules/nearTrigger.js",
@@ -29,7 +29,8 @@ var CONTOLLER_SCRIPTS = [ · 3 unmodified lines
29 "controllerModules/disableOtherModule.js",29 "controllerModules/disableOtherModule.js",
30 "controllerModules/farTrigger.js",30 "controllerModules/farTrigger.js",
31 "controllerModules/teleport.js",31 "controllerModules/teleport.js",
32 "controllerModules/scaleAvatar.js"32 "controllerModules/scaleAvatar.js",
33 "controllerModules/hudOverlayPointer.js"
33];34];
34 35
35var DEBUG_MENU_ITEM = "Debug defaultScripts.js";36var DEBUG_MENU_ITEM = "Debug defaultScripts.js";