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

- Replace window name check with tag check for GUI code (closing #258)

2017-02-28 20:38:58 -05:00

configurationmanager_doc.inl

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

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

configurationmanager.cpp

- Remove documentation.h include and replace with forward declaration

2017-03-02 18:53:04 +01:00

downloadmanager.cpp

Update Ghoul repository

2017-03-03 10:55:20 -05:00

logfactory.cpp

- Some cleanup of LuaConsole

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

moduleengine_lua.inl

Update copyright header to 2017

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

moduleengine.cpp

Some cleanup of ModuleEngine

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

openspaceengine_lua.inl

Update copyright header to 2017

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

openspaceengine.cpp

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

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

settingsengine.cpp

Move the PropertyOwner name specification into the constructor and adjust accordingly

2017-03-02 18:25:13 -05:00

syncengine.cpp

Some cleanup of ModuleEngine

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