Alexander Bock c01bb7834b Merge branch 'develop' into feature/scenegraphloader ...

Conflicts:
	src/abuffer/abuffer.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp

2015-04-17 13:31:39 +02:00

..

model

SPICE error handling, position/rotation estimation etc...

2015-04-09 17:35:30 -04:00

planets

SPICE error handling, position/rotation estimation etc...

2015-04-09 17:35:30 -04:00

stars

More changes to allow JupiterProjection and PlutoProjection in the same scene

2015-02-24 19:16:15 +01:00

renderable.h

SPICE error handling, position/rotation estimation etc...

2015-04-09 17:35:30 -04:00

renderablefieldlines.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

renderablefov.h

Make the line width of renderablefov changeable

2015-02-25 11:53:20 +01:00

renderablepath.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

renderableplane.h

Fixed a crash with RenderablePlane

2015-02-26 13:25:13 +01:00

renderablesphere.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

renderablesphericalgrid.h

Merge branch 'develop' into plutoViz

2015-02-18 15:52:35 +01:00

renderabletrail.h

More changes to allow JupiterProjection and PlutoProjection in the same scene

2015-02-24 19:16:15 +01:00

renderablevolume.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

renderablevolumegl.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

renderengine.h

More work on SceneGraph

2015-04-13 16:07:27 +02:00