Brad Davis ba357721bf Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements ... Fix for vive controllers sometimes not working		2016-05-11 14:32:33 -07:00
..
developer	viveTouchpadTest.js: don't throw if there is no Vive controller attached.	2016-05-11 13:35:17 -07:00
system	Merge pull request #7809 from howard-stearns/hand-controller-pointer	2016-05-10 16:37:26 -07:00
tutorials	d'oh	2016-05-09 15:28:25 -07:00
defaultScripts.js	Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer	2016-05-09 09:26:28 -07:00