Matthew Territo 16fedc73de Merge commit '64524e8f44763b4601895e0bb896f628f877782b' into feature/websocketnavigation ...

* commit '64524e8f44763b4601895e0bb896f628f877782b':
  Renamed "RenderOptionInfo" to "RenderOption" (closes #692)
  Add Lua functions to print cluster id (closes #704)
  Show current and total file size for each download (closes #705)
  Fix subscription bug introduced in code cleanup
  Update Ghoul and sgct repository
  Add strange units to the distance conversion (closes #703)
  Render text informing of ongoing shutdown (#696)
  Fix bug preventing specification of easing function for property setting (closes #695)
  Make it possible to not load an asset on default and later load it at runtime (closes #694)
  Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693)

Conflicts:
	ext/ghoul

2018-08-29 11:32:41 -06:00

..

topics

Merge commit '64524e8f44763b4601895e0bb896f628f877782b' into feature/websocketnavigation

2018-08-29 11:32:41 -06:00

connection.cpp

Initial WebsocketInputStates and FlightControllerTopic

2018-07-11 17:25:59 -06:00

connectionpool.cpp

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

jsonconverters.cpp

Rename DashboardGlobeLocation to DashboardItemGlobeLocation

2018-07-05 12:00:32 -04:00