overte-HifiExperiments/interface/resources/controllers
Brad Davis de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
2015-10-20 21:59:00 -07:00
..
hydra.json Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
keyboardMouse.json Get conditional routes working 2015-10-20 16:32:00 -07:00
mapping-config.json Working on JSON parsing and cleanup 2015-10-20 10:15:36 -07:00
mapping-test0.json Working on JSON parsing and cleanup 2015-10-20 10:15:36 -07:00
standard.json Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
xbox.json Working on JSON parsing and cleanup 2015-10-20 10:20:28 -07:00