volansystech 87ceebca82 Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js		2017-04-27 12:58:18 +05:30
..
controllerDisplay.js
controllerDisplayManager.js
controllerScripts.js	Load controller scripts in their own script engine	2017-03-15 14:31:13 +13:00
grab.js	grab and handControllerGrab use new far-grab action	2017-04-14 11:52:07 -07:00
handControllerGrab.js	Merge branch 'master' of https://github.com/highfidelity/hifi into 21200	2017-04-27 12:58:18 +05:30
handControllerPointer.js	change all references of Quat.getFront to Quat.getForward in scripts directory	2017-03-21 22:25:30 +00:00
leapHands.js
squeezeHands.js
teleport.js	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 03:44:24 +02:00
toggleAdvancedMovementForHandControllers.js	use the correct property name for useAdvancedMovementControls	2017-03-15 10:34:43 -07:00
touchControllerConfiguration.js
viveControllerConfiguration.js