Michal Marcinkowski f6d382f9f9 Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge ...

Conflicts:
	src/rendering/renderengine.cpp

2015-05-04 20:27:52 -04:00

..

model

Fixes to trails, fov and adding some keybindings

2015-05-04 20:15:34 -04:00

planets

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00

stars

More changes to allow JupiterProjection and PlutoProjection in the same scene

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

renderable.h

Added body string to renderable to be able to search for target in scenegraph

2015-04-21 20:31:33 -04:00

renderablefieldlines.h

Updated copyright header in all files

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

renderablefov.h

Fixes to trails, fov and adding some keybindings

2015-05-04 20:15:34 -04: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

renderableplaneprojection.h

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04: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

Restored some changes lost in merge + "timedots"

2015-05-04 19:30:57 -04: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