Michael Nilsson 3a80405c30 solve merge conflict

2016-05-04 12:10:49 -04:00

..

modelgeometry.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

modelgeometry.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

multimodelgeometry.cpp

fix bug in multimodelgeometry loading, initializing w to 0 for all vertices

2016-03-23 11:52:29 +01:00

multimodelgeometry.h

New multi-geometry model handler.

2016-03-16 08:56:18 -04:00

planetgeometry.cpp

Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes

2016-04-20 13:06:40 +02:00

planetgeometry.h

Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes

2016-04-20 13:06:40 +02:00

renderableconstellationbounds.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderableconstellationbounds.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablecrawlingline.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablemodel.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablemodel.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablepath.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablepath.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderableplane.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderableplane.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderableplanet.cpp

Use correct shader in RenderablePlanet

2016-05-01 13:39:09 +02:00

renderableplanet.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablesphere.cpp

Use correct shader in RenderablePlanet

2016-05-01 13:39:09 +02:00

renderablesphere.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablesphericalgrid.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablesphericalgrid.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablestars.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderablestars.h

Add FloatProperty to RenderableStars to modify transparency (closing #150)

2016-04-08 15:11:46 +02:00

renderabletrail.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

renderabletrail.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

screenspaceframebuffer.cpp

Set attributes of screenspacerenderable through dictionary

2016-05-03 15:35:33 -04:00

screenspaceframebuffer.h

ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory

2016-05-03 10:39:32 -04:00

screenspaceimage.cpp

Set attributes of screenspacerenderable through dictionary

2016-05-03 15:35:33 -04:00

screenspaceimage.h

ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory

2016-05-03 10:39:32 -04:00

simplespheregeometry.cpp

Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes

2016-04-20 13:06:40 +02:00

simplespheregeometry.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

wavefrontgeometry.cpp

untabify to make merge easier

2016-04-20 15:21:30 -04:00

wavefrontgeometry.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00