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
..
config	Add import configuration	2014-01-10 23:26:58 +01:00
controllers	Working on JSON parsing and cleanup	2015-10-20 10:15:36 -07:00
fonts	updated FontAwesome to v4.4	2015-08-25 01:55:52 +02:00
html	Info-view	2015-04-26 10:37:14 -07:00
icons	removed some XML from start-script button which possible caused an error before	2015-10-14 21:10:52 +02:00
images	merging	2015-08-21 16:34:13 -07:00
info	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes	cleanup	2015-10-12 13:35:26 -07:00
qml	Working on JSON parsing and cleanup	2015-10-20 10:15:36 -07:00
shaders	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles	Remove custom styling	2014-08-23 00:16:25 +02:00
visage	Add Ryan's updated smoothing factors.	2014-03-21 10:38:29 -07:00