Alexander Bock 72ba616414 Merge branch 'develop' into feature/remote_redesign ...

Conflicts:
	modules/base/shaders/path_fs.glsl

2015-07-07 20:31:01 +02:00

..

constellationbounds_fs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

constellationbounds_vs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

ephemeris_fs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

ephemeris_vs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

imageplane_fs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

imageplane_vs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

model_fs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

model_vs.glsl

Fix the scaling of renderablemodel by making the magnification a floatproperty

2015-07-01 17:56:51 +02:00

path_fs.glsl

Merge branch 'develop' into feature/remote_redesign

2015-07-07 20:31:01 +02:00

path_gs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

path_vs.glsl

Merge branch 'develop' into feature/remote_redesign

2015-07-07 20:31:01 +02:00

plane_fs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

plane_vs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

sphere_fs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

sphere_vs.glsl

Move shaders into their correct modules

2015-05-21 15:17:38 +02:00

star_fs.glsl

Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0

2015-07-07 11:17:56 +02:00

star_ge.glsl

Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0

2015-07-07 11:17:56 +02:00

star_vs.glsl

Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0

2015-07-07 11:17:56 +02:00