Commit graph

54 commits

Author SHA1 Message Date
Brad Hefta-Gaub
b070306c2c tweak comfort mode filters 2015-10-29 15:53:17 -07:00
AlessandroSigna
5bce95189b fix keyboard mapping (keyboardMouse.js) 2015-10-26 18:14:57 -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