Dante Ruiz 6f30cb1825 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop		2017-07-01 00:48:49 +01:00
..
hydra.json
keyboardMouse.json
kinect.json	add foot IK targets as actions	2017-03-30 19:11:16 -07:00
leapmotion.json	Implement fingers control	2017-06-22 23:32:06 +12:00
neuron.json
oculus_remote.json
oculus_touch.json	oops missed a comma	2017-05-31 10:21:10 -07:00
spacemouse.json
standard.json	Implement fingers control	2017-06-22 23:32:06 +12:00
standard_navigation.json	A and B buttons on oculus touch no longer trigger UI Nav events	2017-01-23 17:08:25 -08:00
touchscreen.json
vive.json	head puck working	2017-06-30 23:43:12 +01:00
xbox.json	A and B buttons on oculus touch no longer trigger UI Nav events	2017-01-23 17:08:25 -08:00