Matthew Territo 92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs ...

# Conflicts:
#	ext/sgct
#	openspace.cfg

2017-05-12 15:40:06 -06: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 remote-tracking branch 'origin/master' into feature/launcherconfigs

2017-05-12 15:40:06 -06: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

Compile fix

2017-03-03 18:19:10 +01:00

openspaceengine.h

Add property and configuration option to disable the scene tag on a master node (closing #247)

2017-04-17 10:55:37 -04: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