Alexander Bock c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop ...

Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl

2016-06-04 19:54:34 +02:00

..

ephemeris.h

Updated copyright header

2016-02-05 17:43:21 +01:00

scene.h

Merge remote-tracking branch 'origin/feature/galaxy' into develop

2016-06-04 19:54:34 +02:00

scenegraph.h

Compile fix for Linux, included string

2016-04-08 10:47:59 -04:00

scenegraphnode.h

improved galaxy rendering

2016-06-03 11:16:57 +02:00