Alexander Bock a3185a0cfa Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp

2017-12-18 14:49:08 -05:00

..

atmosphere

Updated absPath in shaders compilation.

2017-12-18 10:26:26 -05:00

base

Merged master into NewAtmosphere.

2017-12-14 15:55:27 -05:00

debugging

Update Ghoul repository

2017-12-13 21:55:29 -05:00

digitaluniverse

Merge branch 'master' into feature/NewAtmosphere

2017-12-18 14:49:08 -05:00

fieldlines

Update Ghoul repository

2017-12-13 21:55:29 -05:00

fieldlinessequence

Update Ghoul repository

2017-12-13 21:55:29 -05:00

galaxy

Update Ghoul repository

2017-12-13 21:55:29 -05:00

globebrowsing

Merge branch 'master' into feature/NewAtmosphere

2017-12-18 14:49:08 -05:00

imgui

Merged master into NewAtmosphere.

2017-12-14 15:55:27 -05:00

iswa

Update Ghoul repository

2017-12-13 21:55:29 -05:00

kameleon

Remove erraneous enabled OpenGL checking code

2017-12-12 13:07:56 -05:00

kameleonvolume

Update Ghoul repository

2017-12-13 21:55:29 -05:00

multiresvolume

Making most logger categories constexpr

2017-12-11 23:46:34 -05:00

space

Merged master into NewAtmosphere.

2017-12-14 15:55:27 -05:00

spacecraftinstruments

Update Ghoul repository

2017-12-13 21:55:29 -05:00

touch

Reenable digital universe on default

2017-12-18 11:58:22 -05:00

toyvolume

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

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

volume

Making most logger categories constexpr

2017-12-11 23:46:34 -05:00