Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta ...

Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl

2016-08-29 15:53:59 +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

Merge branch 'develop' into feature/globebrowsing

2016-08-17 19:53:28 -04:00

factorymanager.h

Removing Jenkins warnings

2016-02-05 23:28:45 +01:00

factorymanager.inl

More cleanup of FactoryManager

2015-12-14 17:55:24 -08: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

Make OpenSpaceModule a properties::PropertyOwner so that it can own properties

2016-07-31 19:26:55 +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

time.h

Move the LuaLibrary definition into its own file

2016-07-18 12:40:29 +02: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