Christoph Oelckers 33ee0f3c27 Merge branch 'master' into modern ... # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/renderer/gl_renderer.h # src/gl/renderer/gl_renderstate.h # src/gl/system/gl_framebuffer.cpp # src/gl/system/gl_framebuffer.h		2018-07-14 13:18:34 +02:00
..
data	- write OpenGL backend for hw_postprocess (FGLRenderBuffers::RenderEffect)	2018-06-20 19:56:30 +02:00
dynlights	- force model light to be attenuated	2018-05-25 19:23:47 +02:00
postprocessing	- fix ssao not working when multisample was off	2018-07-03 23:21:54 +02:00
scene	Merge branch 'master' into modern	2018-07-14 10:24:41 +02:00
textures	- moved the texture binding code back to the OpenGL specific parts.	2018-07-14 13:05:49 +02:00
utility	- fixed calculation of projection matrix for weapon sprites.	2018-06-24 17:16:07 +02:00