Alexander Bock f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp

2017-11-12 10:50:11 -05:00

..

cache

More coding style conformance

2017-11-11 11:25:49 -05:00

chunk

More coding style conformance

2017-11-11 11:25:49 -05: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

More coding style conformance

2017-11-11 11:25:49 -05:00

globes

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

meshes

More coding style conformance

2017-11-11 11:25:49 -05:00

other

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

rendering

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

scripts

Fix bug with layer support for height maps

2017-11-09 10:20:33 -05:00

shaders

Fix previous error appearing when accurate normals were used without height layers.

2017-08-16 14:35:56 +02:00

tile

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

CMakeLists.txt

Fix a variety of warnings

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

globebrowsingmodule_lua.inl

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

globebrowsingmodule.cpp

More coding style conformance

2017-11-11 11:25:49 -05:00

globebrowsingmodule.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

include.cmake

Make Globebrowsing a default module (closes #324)

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