Emil Axelsson ebbbbb2dfd Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/rendering/renderengine.cpp

2016-02-08 15:07:38 +01:00

..

planetgeometryprojection.cpp

Updated copyright header

2016-02-05 22:47:37 +01:00

planetgeometryprojection.h

Updated copyright header

2016-02-05 22:47:37 +01:00

renderablecrawlingline.cpp

Updated copyright header

2016-02-05 17:43:21 +01:00

renderablecrawlingline.h

Updated copyright header

2016-02-05 17:43:21 +01:00

renderablefov.cpp

Updated copyright header

2016-02-05 17:43:21 +01:00

renderablefov.h

Updated copyright header

2016-02-05 17:43:21 +01:00

renderablemodelprojection.cpp

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

2016-02-08 15:07:38 +01:00

renderablemodelprojection.h

Updated copyright header

2016-02-05 17:43:21 +01:00

renderableplaneprojection.cpp

Updated copyright header

2016-02-05 17:43:21 +01:00

renderableplaneprojection.h

Updated copyright header

2016-02-05 17:43:21 +01:00

renderableplanetprojection.cpp

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

2016-02-08 15:07:38 +01:00

renderableplanetprojection.h

Updated copyright header

2016-02-05 22:47:37 +01:00

renderableshadowcylinder.cpp

Enable the RenderableShadowCylinder's color to be set via properties

2016-02-07 20:37:11 +01:00

renderableshadowcylinder.h

Enable the RenderableShadowCylinder's color to be set via properties

2016-02-07 20:37:11 +01:00

simplespheregeometryprojection.cpp

Updated copyright header

2016-02-05 22:47:37 +01:00

simplespheregeometryprojection.h

Updated copyright header

2016-02-05 22:47:37 +01:00

writeToTexture.h

Updated copyright header

2016-02-05 22:47:37 +01:00