David Rowe e29b403abc Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js		2018-09-24 11:44:28 +12:00
..
controllerModules	Merge branch 'master' into M18586	2018-09-24 11:44:28 +12:00
controllerDispatcher.js	removing debug	2018-09-12 10:54:38 -07:00
controllerDisplay.js	when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar	2018-07-05 10:07:49 -07:00
controllerDisplayManager.js	Fixes for scaling controller display	2017-09-05 15:03:41 -07:00
controllerScripts.js	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
godView.js	restore old camera state	2017-07-06 10:41:46 -07:00
grab.js	Merge pull request #13402 from ctrlaltdavid/21895	2018-06-27 12:46:11 -07:00
handTouch.js	Added disable hand touch for entityID	2018-07-17 07:06:48 -07: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	adding alternate solution.	2018-05-31 15:05:33 -07:00
touchControllerConfiguration.js	Render Touch controllers at physical hands's locations	2018-08-04 19:27:44 +12:00
viveControllerConfiguration.js	Clean up comments a bit.	2018-07-18 09:52:25 -07:00