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

# Conflicts:
#	src/rendering/renderengine.cpp

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

..

gpu

Clean up

2017-08-08 17:23:19 +02:00

layer

Fix a variety of warnings

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

chunkrenderer.cpp

Added lunar eclipses back.

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

chunkrenderer.h

Added lunar eclipses back.

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

layershadermanager.cpp

Added lunar eclipses back.

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

layershadermanager.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00