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

# Conflicts:
#	src/rendering/renderengine.cpp

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

..

constellationbounds_fs.glsl

Clean up digitaluniverse data folder

2017-10-17 21:36:54 -04:00

constellationbounds_vs.glsl

Clean up digitaluniverse data folder

2017-10-17 21:36:54 -04:00

nighttexture_fs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

nighttexture_vs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

renderableplanet_fs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

renderableplanet_vs.glsl

Merged master into NewAtmosphere.

2017-07-21 15:02:24 -04:00

rings_fs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

rings_vs.glsl

Merge branch 'master' into feature/NewAtmosphere

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

shadow_fs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

shadow_nighttexture_fs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

shadow_nighttexture_vs.glsl

Merged master into NewAtmosphere.

2017-07-21 15:02:24 -04:00

shadow_vs.glsl

Merged master into NewAtmosphere.

2017-07-21 15:02:24 -04:00

star_fs.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

star_ge.glsl

Merged master into atm.

2017-08-16 12:00:28 -04:00

star_vs.glsl

Merged master into NewAtmosphere.

2017-07-21 15:02:24 -04:00