Emil Axelsson 5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management ...

Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp

2017-07-18 10:54:41 +02:00

..

wrapper

Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass (closes #260)

2017-03-03 18:39:35 -05:00

configurationmanager.h

Merge branch 'master' into feature/statlogs

2017-07-13 18:16:23 -06:00

downloadmanager.h

Feature/satellites (#325)

2017-06-06 13:42:38 -04:00

logfactory.h

- Some cleanup of LuaConsole

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

moduleengine.h

Provide a static member variable Name for all OpenSpaceModules

2017-07-12 13:59:16 -04:00

openspaceengine.h

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-07-18 10:54:41 +02:00

settingsengine.h

Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass (closes #260)

2017-03-03 18:39:35 -05:00

syncengine.h

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

2017-03-07 10:57:50 +01:00

virtualpropertymanager.h

Feature/virtualproperty (#286)

2017-04-13 14:38:28 -04:00