Alexander Bock 0e46642624 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	src/util/factorymanager.cpp

2014-10-11 10:54:52 +02:00

..

ABuffer

PowerScaling modifications

2014-10-03 17:02:31 +02:00

PowerScaling

PowerScaling modifications

2014-10-03 17:02:31 +02:00

cubeFrag.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

cubeVert.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

ephemeris_fs.glsl

Fixed Ephimeris rendering to use PSC correctly

2014-10-08 15:54:09 +02:00

ephemeris_vs.glsl

Fixed Ephimeris rendering to use PSC correctly

2014-10-08 15:54:09 +02:00

exitpoints.frag

PowerScaling modifications

2014-10-03 17:02:31 +02:00

exitpoints.vert

PowerScaling modifications

2014-10-03 17:02:31 +02:00

grid_fs.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

grid_vs.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

plane_fs.glsl

Added RenderablePlane

2014-10-10 15:18:16 +02:00

plane_vs.glsl

Added RenderablePlane

2014-10-10 15:18:16 +02:00

pscstandard_fs.glsl

new class - renderabletrail - will later be renamed and current replace renderableephemeris.

2014-10-07 18:44:14 -04:00

pscstandard_vs.glsl

new class - renderabletrail - will later be renamed and current replace renderableephemeris.

2014-10-07 18:44:14 -04:00

quadFrag.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

quadVert.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

quadVertFlare.glsl

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

singlepassraycaster.frag

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

singlepassraycaster.gs

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

singlepassraycaster.vert

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

star_fs_points.glsl

some cleanup

2014-09-07 16:19:13 -04:00

star_fs.glsl

Fixed blending for stars default framebuffer rendering

2014-10-08 13:43:43 +02:00

star_ge_points.glsl

some cleanup

2014-09-07 16:19:13 -04:00

star_ge.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

star_vs_points.glsl

Changes to the shaders, code cleanup and simplification. Eliminated lots of minor trivial bugs, should run smoothly.

2014-09-05 16:16:55 -04:00

star_vs.glsl

PowerScaling modifications

2014-10-03 17:02:31 +02:00

twopassraycaster.frag

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00

twopassraycaster.vert

Cleaned up fragment shader in power scaling

2014-06-25 10:21:06 -04:00