Michal Marcinkowski 44e02465a1 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp

2015-01-22 10:31:40 -05:00

..

model

Merge branch 'develop' into solarsystem2

2014-12-15 13:23:30 -05:00

planets

Image sequencing improvements and optimization of projection.

2015-01-21 11:28:38 -05:00

stars

Fix memory leaks and proper deinitialization

2014-12-11 10:13:10 +01:00

renderable.h

Changed the deinitialization of renderable from the destructorto the scenegraphnode

2014-12-15 20:51:00 +01:00

renderablefieldlines.h

More code cleanup of RenderableFieldlines

2015-01-21 15:13:16 +01:00

renderablefov.h

Image sequencing improvements and optimization of projection.

2015-01-21 11:28:38 -05:00

renderablepath.h

Removed assertions from renderable constructors

2014-12-12 10:59:28 +01:00

renderableplane.h

Started working on Renderables

2014-12-10 19:43:38 +01:00

renderablesphericalgrid.h

Merge branch 'develop' into solarsystem2

2014-12-08 21:26:38 -05:00

renderabletrail.h

Removed assertions from renderable constructors

2014-12-12 10:59:28 +01:00

renderablevolume.h

Continued work on memory leaks and proper isReady usage

2014-12-11 16:48:49 +01:00

renderablevolumegl.h

Remove cppcheck warnings

2014-12-16 21:54:53 +01:00

renderengine.h

Add log.html to the list of ignored files

2014-12-11 18:09:19 +01:00