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

..

fonts

Some more work on new LuaConsole

2017-05-16 14:47:44 -04:00

scene

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

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

spice

changes from PR comments

2017-07-13 20:10:35 -06:00

tasks

Some minor cleanup

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

web

changes from PR comments

2017-07-13 20:10:35 -06: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