Brad Davis ccbae81dad Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp		2015-10-29 10:24:38 -07:00
..
gamepad
hydra	Merge pull request #6177 from jherico/guns	2015-10-26 10:51:08 -07:00
leap
oculus
RealSense
controllerMappings.js	emit hardwareChanged signal to scripts	2015-10-28 09:34:18 -07:00
handControllerGrab.js	Merge branch 'master' into HEAD	2015-10-29 10:24:38 -07:00
handPosesDebug.js	Fixing typo and review comments	2015-10-28 13:21:45 -07:00
squeezeHands.js	Improvements to squeezeHands.js	2015-09-09 21:46:35 -07:00
toybox.js	update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js	2015-09-02 11:29:37 -07:00