Jonas Strandstedt da37528619 Merge branch 'feature/fieldlines' into feature/ABuffer ...

Conflicts:
	src/rendering/renderablevolumegl.cpp

2014-07-18 13:51:07 -04:00

..

abuffer

Added fixed ABuffer implementation

2014-07-08 13:29:15 -04:00

engine

Added an OpenSpace ShaderCreator

2014-07-10 15:22:57 -04:00

flare

Fix for Flare

2014-05-22 12:57:54 -04:00

interaction

Renamed pss to PowerScaledScalar

2014-05-11 18:34:57 +02:00

interface

Merge branch 'develop' into kameleon

2014-04-24 12:14:02 -04:00

properties

Created classes for PlanetGeometry

2014-05-05 17:28:46 +02:00

query

Code cleanup regarding scenegraphnodes

2014-05-05 12:15:20 +02:00

rendering

Merge branch 'feature/fieldlines' into feature/ABuffer

2014-07-18 13:51:07 -04:00

scenegraph

Intermediate ABuffer commit

2014-06-03 16:50:47 -04:00

tests

Renamed psc to powerscaledcoordinate and pss to powerscaledscalar

2014-05-11 14:32:42 +02:00

util

Merge branch 'feature/fieldlines' into feature/ABuffer

2014-07-18 13:51:07 -04:00