Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing ...

# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h

2016-12-03 01:32:23 +01:00

..

fonts

Add files from the previous data submodule

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

scene

Merge branch 'develop' into feature/globebrowsing

2016-12-03 01:32:23 +01:00

spice

Clean up and multiple transferfunction

2016-04-29 09:56:02 -04:00

web

Sort documentation sections, fix json parse error for keybindings and add detailed documentation to html output

2016-10-27 17:09:56 +02: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