Anton Arbring 30dfc77d81 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp

2015-05-13 16:44:03 -04:00

..

model

More last minute fixes

2015-05-13 16:15:50 -04:00

planets

adding capability to clear images on the fly

2015-05-13 15:19:41 -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

renderablecrawlingline.h

Pre presentation mods

2015-05-12 23:23:29 -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

Added renderablePath with timestamps

2015-05-11 14:41:27 -04:00

renderableplane.h

Fixed a crash with RenderablePlane

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

renderableplaneprojection.h

More last minute fixes

2015-05-13 16:15:50 -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

Fixing CREDITS file

2015-05-13 19:33:34 +02: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

Fix many warnings

2015-05-12 13:05:35 +02:00