Commit graph

53 commits

Author SHA1 Message Date
Brad Davis
b9b03bd842 Working on conditional and filter parsing 2015-10-21 14:40:33 -07:00
samcake
da26d0dee1 Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -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