Michael Nilsson 7dfdb2083e solved merge conflict

2016-03-11 15:09:07 -05:00

..

abufferrenderer.h

- Add currentDrawBufferResolution method in WindowWrapper

2016-02-09 10:46:51 +01:00

framebufferrenderer.h

refactor abuffer and add msaa support. volumes temporarily disabled.

2016-02-02 11:30:27 +01:00

renderable.h

Updated copyright header

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

renderengine.h

ScreenSpaceRenderabled enabled propery in GUI

2016-03-10 11:19:22 -05:00

renderer.h

Updated copyright header

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

screenspacerenderable.h

solved merge conflict

2016-03-11 15:09:07 -05:00

volume.h

refactor abuffer and add msaa support. volumes temporarily disabled.

2016-02-02 11:30:27 +01:00