Michael Nilsson 8ca457b14c solve merge conflict with develop

2016-05-20 09:33:41 -04:00

..

constellationbounds_fs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

constellationbounds_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

ephemeris_fs.glsl

Updated copyright header

2016-02-05 22:47:37 +01:00

ephemeris_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

imageplane_fs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

imageplane_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

model_fs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

model_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

nighttexture_fs.glsl

Some fixes on heightmap displacement for RenderablePlanet

2016-05-18 19:03:03 +02:00

nighttexture_vs.glsl

Some fixes on heightmap displacement for RenderablePlanet

2016-05-18 19:03:03 +02:00

path_fs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

path_gs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

path_vs.glsl

Updated copyright header

2016-02-05 22:47:37 +01:00

plane_fs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

plane_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

pscstandard_fs.glsl

Moving pscstandard shader into base

2016-05-01 13:21:57 +02:00

pscstandard_vs.glsl

Moving pscstandard shader into base

2016-05-01 13:21:57 +02:00

screnspace_fs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

screnspace_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

sphere_fs.glsl

Use correct orientation for renderableplaneprojection

2016-04-23 04:07:51 +02:00

sphere_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00

star_fs.glsl

Add FloatProperty to RenderableStars to modify transparency (closing #150)

2016-04-08 15:11:46 +02:00

star_ge.glsl

Updated copyright header

2016-02-05 22:47:37 +01:00

star_vs.glsl

untabify to make merge easier

2016-04-20 15:21:30 -04:00