Emil Axelsson d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume ...

Conflicts:
	src/engine/openspaceengine.cpp

2017-03-03 18:08:29 +01:00

..

wrapper

Move OpenSpaceEngine::isMaster method into WindowWrapper class

2017-02-25 11:29:28 -05:00

configurationmanager.h

Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.

2017-03-02 18:20:01 +01:00

downloadmanager.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

logfactory.h

- Some cleanup of LuaConsole

2017-03-02 14:27:18 -05:00

moduleengine.h

Some cleanup of ModuleEngine

2017-03-02 17:24:44 -05:00

openspaceengine.h

More cleanup in OpenSpaceEngine

2017-02-25 19:19:31 -05:00

settingsengine.h

Some cleanup of ModuleEngine

2017-03-02 17:24:44 -05:00

syncengine.h

Some cleanup of ModuleEngine

2017-03-02 17:24:44 -05:00