Alexander Bock d1cdc3d26f Merge branch 'master' into feature/PerformanceATM ...

# Conflicts:
#	data/assets/default.scene
#	data/assets/scene/solarsystem/planets/earth/earth.asset

2018-03-14 23:26:56 -04:00

..

atmosphere

Squeezed the Bits a little more.

2018-03-08 12:28:33 -05:00

base

Fixed normals. (#553)

2018-03-14 13:18:19 -04:00

debugging

Feature/new formatting (#547)

2018-03-07 18:10:32 -05:00

digitaluniverse

Apply coding styles

2018-03-08 05:32:46 -05:00

fieldlines

Remove warnings

2018-03-12 22:31:01 +01:00

fieldlinessequence

Remove warnings

2018-03-12 22:31:01 +01:00

galaxy

Remove warnings

2018-03-12 22:31:01 +01:00

globebrowsing

Add Override parameter for URLSynchronization

2018-03-09 11:42:32 -05:00

imgui

Various small fixes

2018-03-14 13:13:23 -04:00

iswa

Remove warnings

2018-03-12 22:31:01 +01:00

kameleon

Remove warnings

2018-03-12 22:31:01 +01:00

kameleonvolume

Remove Clang warnings

2018-03-08 20:18:18 +01:00

multiresvolume

Remove warnings

2018-03-12 22:31:01 +01:00

space

Simplification of the satellite asset

2018-03-14 17:44:08 -04:00

spacecraftinstruments

Various small fixes

2018-03-14 13:13:23 -04:00

spout

Apply coding styles

2018-03-08 05:32:46 -05:00

sync

Make URLSynchronization and HTTPSynchronization download into temporary files and if the download succeeds, transactionally move the temporary file into the correct destination

2018-03-10 05:08:14 -05:00

touch

Remove warnings

2018-03-12 22:31:01 +01:00

toyvolume

Only make an internalInitialize in OpenSpaceModule that accepts a ghoul::Dictionary

2017-12-31 17:32:40 -05:00

volume

Feature/new formatting (#547)

2018-03-07 18:10:32 -05:00