Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

abufferrenderer.h

Merged master into atm.

2017-08-16 12:00:28 -04:00

deferredcaster.h

Pull request changes.

2017-08-15 18:15:56 -04:00

deferredcasterlistener.h

Pull request changes.

2017-08-15 18:15:56 -04:00

deferredcastermanager.h

Pull request changes.

2017-08-15 18:15:56 -04:00

framebufferrenderer.h

Merged master into NewAtmosphere.

2017-10-17 20:14:41 -04:00

raycasterlistener.h

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

raycastermanager.h

More cleanup

2017-06-09 19:29:20 -04:00

renderable.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

renderengine.h

Merge branch 'master' into feature/NewAtmosphere

2017-10-24 15:30:22 -04:00

renderer.h

Merged master into atm.

2017-08-16 12:00:28 -04:00

screenspacerenderable.h

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

transferfunction.h

Add a style check that checks whether the correct GLM header is used

2017-02-14 13:12:59 -05:00

volume.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

volumeraycaster.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00