Seth Alves ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller		2017-05-30 13:42:20 -07:00
..
hydra.json
keyboardMouse.json
kinect.json	add foot IK targets as actions	2017-03-30 19:11:16 -07:00
neuron.json
oculus_remote.json
oculus_touch.json	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
spacemouse.json
standard.json	added arms	2017-05-24 01:28:08 +01:00
standard_navigation.json
touchscreen.json
vive.json	fixed merge conflict	2017-05-24 19:35:41 +01:00
xbox.json