Emil Axelsson d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume ...

Conflicts:
	src/engine/openspaceengine.cpp

2017-03-03 18:08:29 +01:00

..

abufferrenderer.h

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume

2017-03-03 18:08:29 +01:00

framebufferrenderer.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

raycasterlistener.h

Fixed include guards

2017-02-09 19:12:21 -05:00

raycastermanager.h

Fixed include guards

2017-02-09 19:12:21 -05:00

renderable.h

Update Ghoul repository to have the factory return unique_ptrs

2017-03-01 22:03:48 -05:00

renderengine.h

Move the disabling of the rendering on the master into the RenderEngine

2017-03-01 10:39:29 -05:00

renderer.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

screenspacerenderable.h

Update Ghoul repository to have the factory return unique_ptrs

2017-03-01 22:03:48 -05: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

Fixed include guards

2017-02-09 19:12:21 -05:00

volumeraycaster.h

Fixed include guards

2017-02-09 19:12:21 -05:00