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

..

engine

Add Lua function to check whether a specific module is loaded (closing #36)

2016-06-04 19:38:56 +02:00

interaction

untabify to make merge easier

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

network

untabify to make merge easier

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

properties

Remove cygnet groups

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

query

Name changes

2016-05-09 13:09:47 -04:00

rendering

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

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

scene

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

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

scripting

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

util

Allow the disabling of ISWA components

2016-06-02 13:25:05 +02:00

openspace.h

Updating versioning number to prerelease-9 (IPS)

2016-05-31 18:26:20 +02:00