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

Remove DynamicEphemeris as it is superseded by StaticEphemeris

2016-04-25 14:04:05 +02:00

rendering

RenderableTrail bug fix

2016-05-25 17:19:20 -04:00

shaders

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

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

basemodule.cpp

windows fix, add base module as dependency to iswa

2016-05-04 12:43:59 -04:00

basemodule.h

Updated copyright header

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

CMakeLists.txt

solve merge conflict with develop

2016-05-03 17:11:28 -04:00

include.cmake

Getting a running version of modularized cmakelists up and running

2015-05-23 02:03:06 +02:00