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

..

chunk

Merge branch 'develop' into feature/globebrowsing

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

ext/gdal

Update GDAL library

2016-06-14 22:57:30 +02:00

gdal_data

Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable.

2016-06-17 15:52:32 -04:00

geometry

Merge branch 'develop' into feature/globebrowsing

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

globes

Merge branch 'develop' into feature/globebrowsing

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

meshes

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

other

Add enabling of stats collection for ChunkedLODGlobe in GUI

2016-11-23 12:23:38 +01:00

rendering

Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing

2016-11-29 13:35:30 +01:00

shaders

Change tabs to spaces

2016-12-03 01:21:54 +01:00

tile

Merge branch 'develop' into feature/globebrowsing

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

.gitignore

Add gitignore to ignore documentation.

2016-10-18 14:04:01 +02:00

CMakeLists.txt

Add TileProviderByIndex and use test for Earth

2016-11-29 01:06:45 +01:00

Doxyfile

Add Doxyfile to the globebrowsing module

2016-09-13 20:23:01 -04:00

gdal_log

Add Mars datasets.

2016-06-20 19:33:20 -04:00

globebrowsingmodule.cpp

Add TileProviderByIndex and use test for Earth

2016-11-29 01:06:45 +01:00

globebrowsingmodule.h

Convert tabs to spaces.

2016-08-17 00:30:53 -04:00

include.cmake

Disable default module setting for galaxy, globebrowsing, and multiresvolume

2016-06-24 10:55:49 +02:00