Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing ...

Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp

2016-09-20 15:52:01 +02:00

..

blockplaneintersectiongeometry.h

untabify to make merge easier

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

boxgeometry.h

untabify to make merge easier

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

camera.h

Remove explicit syncing in Time and Camera and let SyncEngine do the work

2016-09-15 17:03:46 -04:00

factorymanager.h

Add the ability to the FactoryManager to write documentation about all registered classes

2016-09-16 17:37:02 +02:00

factorymanager.inl

Add the ability to the FactoryManager to write documentation about all registered classes

2016-09-16 17:37:02 +02:00

histogram.h

Find highest value over multiple bins in histogram

2016-06-10 15:36:36 -04:00

keys.h

Add to_string methods to Key, KeyModifier, and KeyWithModifier

2016-07-14 00:27:03 -04:00

mouse.h

untabify to make merge easier

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

openspacemodule.h

Adding DocumentationEngine

2016-09-15 13:48:28 +02:00

powerscaledcoordinate.h

untabify to make merge easier

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

powerscaledscalar.h

Include file cleanup

2016-06-27 15:02:21 +02:00

powerscaledsphere.h

untabify to make merge easier

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

progressbar.h

untabify to make merge easier

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

screenlog.h

Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent

2016-06-06 01:54:41 +02:00

spicemanager.h

Add initial implementation of rings for Saturn

2016-07-29 07:54:16 +02:00

syncbuffer.h

Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)

2016-08-17 16:26:14 +02:00

syncdata.h

Inject SyncBuffer into SyncEngine. Add Doxygen comments for SyncEngine and SyncData

2016-09-16 20:32:29 -04:00

time.h

Remove explicit syncing in Time and Camera and let SyncEngine do the work

2016-09-15 17:03:46 -04:00

timerange.h

Add forgotten file

2016-08-22 15:35:27 -04:00

transformationmanager.h

Convert tabs to spaces.

2016-08-17 00:30:53 -04:00

updatestructures.h

Merge branch 'feature/render-bins' into feature/rosetta

2016-08-29 15:53:59 +02:00