Brad Hefta-Gaub 1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers ... Conflicts: libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h		2016-10-20 09:38:03 -07:00
..
grab.js	don't use globals and remove double definitions	2016-08-25 08:57:06 -07:00
handControllerGrab.js	Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments	2016-10-19 21:51:02 -07:00
handControllerPointer.js	use head pose for controller in case there are no hand controllers available	2016-10-18 10:01:00 -07:00
leapHands.js	leap	2016-06-03 15:40:04 -07:00
squeezeHands.js	wrap default scripts with local scope	2016-08-25 08:57:06 -07:00
teleport.js	better handling of the teleport target overlays to prevent flashing and thrashing	2016-10-13 18:24:38 -07:00
toggleAdvancedMovementForHandControllers.js	Fix advanced movement being disabled	2016-10-07 10:30:18 -07:00