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

..

base

Provide a static member variable Name for all OpenSpaceModules

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

debugging

Provide a static member variable Name for all OpenSpaceModules

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

fieldlines

Provide a static member variable Name for all OpenSpaceModules

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

galaxy

Provide a static member variable Name for all OpenSpaceModules

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

globebrowsing

Fix compilation warnings.

2017-07-14 22:48:32 +02:00

iswa

Provide a static member variable Name for all OpenSpaceModules

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

kameleon

Provide a static member variable Name for all OpenSpaceModules

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

kameleonvolume

Provide a static member variable Name for all OpenSpaceModules

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

multiresvolume

Provide a static member variable Name for all OpenSpaceModules

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

newhorizons

Line endings

2017-07-13 11:00:50 -06:00

onscreengui

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

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

space

Line endings

2017-07-13 11:00:50 -06:00

touch

Interaction Updates (#353)

2017-07-14 17:17:17 +02:00

toyvolume

Provide a static member variable Name for all OpenSpaceModules

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

volume

Line endings

2017-07-13 11:00:50 -06:00