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

..

ext/imgui

Code cleanup

2017-02-27 23:03:07 -05:00

include

Create BoolProperty for PerformanceComponent

2017-07-07 12:33:49 -06:00

shaders

Update copyright header to 2017

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

src

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

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

CMakeLists.txt

Adding a Gui window to show the registered file paths (closes #329)

2017-06-03 14:29:33 -04:00

include.cmake

…

onscreenguimodule.cpp

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

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

onscreenguimodule.h

spaces instead of tabs

2017-07-13 13:09:25 -06:00