Michael Nilsson 85225946b9 solved merge conflict

2016-03-18 13:57:28 -04:00

..

modelgeometry.cpp

Changes to accept the new multi-geometry handler, removed wavefrontgeometry header file include and identation fixes.

2016-03-16 09:03:55 -04:00

modelgeometry.h

Updated copyright header

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

multimodelgeometry.cpp

New multi-geometry model handler.

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

multimodelgeometry.h

New multi-geometry model handler.

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

planetgeometry.cpp

Updated copyright header

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

planetgeometry.h

Updated copyright header

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

renderableconstellationbounds.cpp

Updated copyright header

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

renderableconstellationbounds.h

Updated copyright header

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

renderablecrawlingline.cpp

Sorting more classes into the correct modules

2015-05-20 21:40:52 +02:00

renderablemodel.cpp

Updated copyright header

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

renderablemodel.h

Updated copyright header

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

renderablepath.cpp

Updated copyright header

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

renderablepath.h

Updated copyright header

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

renderableplane.cpp

Updated copyright header

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

renderableplane.h

Updated copyright header

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

renderableplanet.cpp

Update Ghoul version to accommodate public API bool parameter changes

2016-03-06 08:08:06 +01:00

renderableplanet.h

Updated copyright header

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

renderablesphere.cpp

Update Ghoul version to accommodate public API bool parameter changes

2016-03-06 08:08:06 +01:00

renderablesphere.h

Updated copyright header

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

renderablesphericalgrid.cpp

Update Ghoul version to accommodate public API bool parameter changes

2016-03-06 08:08:06 +01:00

renderablesphericalgrid.h

Updated copyright header

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

renderablestars.cpp

Update Ghoul version to accommodate public API bool parameter changes

2016-03-06 08:08:06 +01:00

renderablestars.h

Updated copyright header

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

renderabletrail.cpp

Remove startup warnings

2016-02-21 01:50:51 +01:00

renderabletrail.h

Updated copyright header

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

screenspaceframebuffer.cpp

solved merge conflict

2016-03-18 13:57:28 -04:00

screenspaceframebuffer.h

Crop framebuffers

2016-03-18 11:11:42 -04:00

screenspaceimage.cpp

Scale fix

2016-03-17 18:11:47 -04:00

screenspaceimage.h

Tests for screenSpaceFramebuffer

2016-03-17 15:38:21 -04:00

simplespheregeometry.cpp

Updated copyright header

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

simplespheregeometry.h

Updated copyright header

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

wavefrontgeometry.cpp

Updated copyright header

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

wavefrontgeometry.h

Updated copyright header

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