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

Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl

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

..

fonts

Add files from the previous data submodule

2016-02-21 01:52:48 +01:00

scene

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

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

spice

Clarify spice comments

2017-03-02 18:20:03 +01:00

tasks

Some minor cleanup

2017-03-05 20:08:24 -05:00

web

Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.

2017-03-02 18:20:01 +01:00

cdflist.json

windows fix

2016-05-25 14:06:15 -04:00

cdflist.txt

Load cdf files at start up

2016-05-24 14:42:38 -04:00

ionosphere_variables.json

Ionosphere test data

2016-05-13 15:22:50 -04:00

test2.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00

test3.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00