Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

cache

Globe browsing: fix implicit conversion errors and remove warnings (#393)

2017-09-01 12:03:31 -04:00

chunk

Globe browsing: fix implicit conversion errors and remove warnings (#393)

2017-09-01 12:03:31 -04:00

ext/gdal

Update GDAL version to 2.2.0

2017-06-08 12:30:16 -04:00

gdal_data

Update GDAL version to 2.2.0

2017-06-08 12:30:16 -04:00

geometry

Added lunar eclipses back.

2017-10-19 11:41:36 -04:00

globes

Added lunar eclipses back.

2017-10-19 11:41:36 -04:00

meshes

Jenkins compile fix

2017-07-18 18:27:30 -04:00

other

Pr/core threadpool (#401)

2017-09-22 13:22:03 +02:00

rendering

Merge branch 'master' into feature/NewAtmosphere

2017-10-24 15:30:22 -04:00

scripts

Only add color layers and height layers through info files if they exist

2017-10-20 17:01:44 -04:00

shaders

Added lunar eclipses back.

2017-10-19 11:41:36 -04:00

tile

Fix a variety of warnings

2017-10-21 10:10:40 -04:00

CMakeLists.txt

Merge branch 'master' into feature/NewAtmosphere

2017-10-24 15:30:22 -04:00

globebrowsingmodule_lua.inl

Fix a variety of warnings

2017-10-21 10:10:40 -04:00

globebrowsingmodule.cpp

Fix compile error in GlobeBrowsing module without GDAL (closes #396)

2017-09-30 15:47:11 -06:00

globebrowsingmodule.h

Feature/gb gui (#390)

2017-08-19 20:23:08 -04:00

include.cmake

Make Globebrowsing a default module (closes #324)

2017-06-09 11:33:07 -04:00