Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing ...

Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp

2016-09-20 15:52:01 +02:00

..

modelgeometry.cpp

Clang compile fixes

2016-09-08 13:22:34 +02:00

modelgeometry.h

Set bounding sphere of RenderableModelProjection based on its geometry

2016-08-10 17:38:19 -04:00

multimodelgeometry.cpp

Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision

2016-08-02 19:14:52 -04:00

multimodelgeometry.h

New multi-geometry model handler.

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

planetgeometry.cpp

Removing more CppCheck warnings

2016-07-28 20:31:53 +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

Merge branch 'develop' into feature/globebrowsing

2016-09-20 15:52:01 +02:00

renderablemodel.h

Merge from globebrowsing

2016-08-17 20:25:58 -04:00

renderablepath.cpp

Remove local, shared, synced versions of Time. Keep one source of true

2016-09-03 19:45:58 -04:00

renderablepath.h

Update renderable path to fade away with distance

2016-08-17 16:58:53 -04:00

renderableplane.cpp

Merge branch 'feature/render-bins' into feature/rosetta

2016-08-29 15:53:59 +02:00

renderableplane.h

add support for additive blending in renderable plane

2016-08-25 20:44:00 +02:00

renderableplanet.cpp

Clean up: Remove targetBody from Renderable

2016-08-12 16:42:33 -04:00

renderableplanet.h

Merge from globebrowsing

2016-08-17 20:25:58 -04:00

renderablerings.cpp

Implement shadowing on RenderableRings

2016-07-31 20:22:29 +02:00

renderablerings.h

Implement shadowing on RenderableRings

2016-07-31 20:22:29 +02: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

Removing more CppCheck warnings

2016-07-28 20:31:53 +02:00

renderablestars.h

Remove CppCheck warnings

2016-07-28 18:04:08 +02:00

renderabletrail.cpp

Merge branch 'feature/render-bins' into feature/rosetta

2016-08-29 15:53:59 +02:00

renderabletrail.h

Remove CppCheck warnings

2016-07-28 18:04:08 +02:00

renderabletrailnew.cpp

Update comments about new renderable trail.

2016-08-23 17:58:59 -04:00

renderabletrailnew.h

Small comment in renderabletrailnew

2016-08-24 11:43:09 -04:00

screenspaceframebuffer.cpp

Add visibility toggle to Property base class

2016-06-28 14:50:53 +02:00

screenspaceframebuffer.h

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

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

screenspaceimage.cpp

Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)

2016-08-17 16:26:14 +02:00

screenspaceimage.h

Started cleanup of ScreenSpaceImage

2016-06-16 01:22:30 +02:00

simplespheregeometry.cpp

solve merge conflict with develop

2016-05-20 09:33:41 -04: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