64 commits

Author	SHA1	Message	Date
AlessandroSigna	5bce95189b	fix keyboard mapping (keyboardMouse.js)	2015-10-26 18:14:57 -07:00
Brad Davis	f38303a9a5	Adding vive default mapping	2015-10-26 10:36:31 -07:00
Brad Hefta-Gaub	67f2a0c6c8	CR feedback on mappings	2015-10-22 11:39:51 -07:00
Brad Hefta-Gaub	3e7364608b	make handControllerGrab.js work with new API	2015-10-22 09:17:29 -07:00
Brad Davis	b9b03bd842	Working on conditional and filter parsing	2015-10-21 14:40:33 -07:00
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
samcake	da26d0dee1	Adding the hand poses channels in the controller mapping files	2015-10-20 18:19:44 -07:00
Brad Davis	eacd6af032	Get conditional routes working	2015-10-20 16:32:00 -07:00
Brad Davis	bea6fdd890	Working on JSON parsing and cleanup ... Conflicts: libraries/controllers/src/controllers/Route.cpp libraries/controllers/src/controllers/ScriptingInterface.cpp libraries/controllers/src/controllers/StandardController.cpp libraries/controllers/src/controllers/impl/RouteBuilderProxy.h	2015-10-20 10:20:28 -07:00
Brad Davis	ef6c4f6f66	Working on JSON parsing and cleanup ... Conflicts: libraries/controllers/src/controllers/Route.cpp libraries/controllers/src/controllers/ScriptingInterface.cpp libraries/controllers/src/controllers/StandardController.cpp libraries/controllers/src/controllers/impl/RouteBuilderProxy.h	2015-10-20 10:15:36 -07:00
Brad Davis	db0fa6b8ed	Update hydra mappings and test code	2015-10-16 17:23:09 -07:00
Brad Davis	4f8e2c9f6b	Fix JSON format errors	2015-10-15 13:18:04 -07:00
samcake	297c3c9ed0	Fixing json issues	2015-10-09 17:37:51 -07:00
samcake	c02d33c17c	Adding example mapping files	2015-10-09 17:27:50 -07:00