Alexander Bock af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache ...

# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp

2020-09-04 14:02:17 +02:00

..

abufferrenderer.h

General code cleanup

2020-04-14 15:48:58 +02:00

dashboard.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

dashboarditem.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

deferredcaster.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

deferredcasterlistener.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

deferredcastermanager.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

framebufferrenderer.h

General code cleanup

2020-04-14 15:48:58 +02:00

helper.h

Refactor

2020-06-30 14:00:32 +02:00

loadingscreen.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

luaconsole.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

raycasterlistener.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

raycastermanager.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

renderable.h

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

renderengine.h

Merge remote-tracking branch 'origin/master' into feature/openglstatecache

2020-09-04 14:02:17 +02:00

renderer.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

screenspacerenderable.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

transferfunction.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

volume.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

volumeraycaster.h

General code cleanup

2020-04-14 15:48:58 +02:00