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

# Conflicts:
#	src/rendering/renderengine.cpp

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

..

atmosphere

Change shadow group name.

2017-10-19 11:44:38 -04:00

base

Merge branch 'master' into feature/NewAtmosphere

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

debugging

Rename NewHorizons module to SpacecraftInstruments

2017-08-14 13:27:47 -04:00

digitaluniverse

Merge branch 'master' into feature/NewAtmosphere

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

fieldlines

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

galaxy

Minor compile fixes

2017-10-10 11:27:29 -04:00

globebrowsing

Merge branch 'master' into feature/NewAtmosphere

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

imgui

Merge branch 'master' into feature/NewAtmosphere

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

iswa

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

kameleon

Fixed double declaration of style variable.

2017-10-18 21:46:20 -04:00

kameleonvolume

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

multiresvolume

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

space

Merge branch 'master' into feature/NewAtmosphere

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

spacecraftinstruments

Fix meridian shift issue on Pluto

2017-08-21 13:53:05 -04:00

touch

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

toyvolume

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

volume

Add support for OpenGL 4.6

2017-10-11 09:05:10 -04:00