Dante Ruiz 6fd8fb1e5b Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval		2017-11-30 11:52:41 -08:00
..
controllerModules	Merge pull request #11838 from druiz17/fix-grabbing	2017-11-27 08:27:42 -08:00
controllerDispatcher.js	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-11-30 11:52:41 -08:00
controllerDisplay.js	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
controllerDisplayManager.js	Fixes for scaling controller display	2017-09-05 15:03:41 -07:00
controllerScripts.js	making requested changes	2017-11-14 13:04:09 -08:00
godView.js	restore old camera state	2017-07-06 10:41:46 -07:00
grab.js	fixing merge conflict	2017-11-13 15:02:25 -08:00
squeezeHands.js	Finger now points when near tablet + deadspot added when touching the tablet	2017-03-08 19:03:56 -08:00
toggleAdvancedMovementForHandControllers.js	use the correct property name for useAdvancedMovementControls	2017-03-15 10:34:43 -07:00
touchControllerConfiguration.js	Updated naturalDimensiosn for touch controller config	2017-09-05 15:39:35 -07:00
viveControllerConfiguration.js	Fixes for scaling controller display	2017-09-05 15:03:41 -07:00