Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta ...

Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl

2016-08-29 15:53:59 +02:00

..

fonts

Add files from the previous data submodule

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

scene

Merge branch 'feature/render-bins' into feature/rosetta

2016-08-29 15:53:59 +02:00

spice

Clean up and multiple transferfunction

2016-04-29 09:56:02 -04: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