History

Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco

r3tk0n committed 7 years ago

Commit 39342b92 parents ce2e0c7 c0240d2321 files · +10278 −2523Browse files

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

Unified · Split

scripts/system/controllers/controllerScripts.js+0−1
@@ -30,7 +30,6 @@ var CONTOLLER_SCRIPTS = [ · 29 unmodified lines
30 "controllerModules/teleport.js",30 "controllerModules/teleport.js",
31 "controllerModules/hudOverlayPointer.js",31 "controllerModules/hudOverlayPointer.js",
32 "controllerModules/mouseHMD.js",32 "controllerModules/mouseHMD.js",
33 "controllerModules/scaleEntity.js",
34 "controllerModules/nearGrabHyperLinkEntity.js",33 "controllerModules/nearGrabHyperLinkEntity.js",
35 "controllerModules/nearTabletHighlight.js",34 "controllerModules/nearTabletHighlight.js",
36 "controllerModules/nearGrabEntity.js",35 "controllerModules/nearGrabEntity.js",