Christoph Oelckers 9b8869e78d Merge branch 'master' into v2.x ... Conflicts: src/gl/textures/gl_material.cpp		2014-09-09 01:30:11 +02:00
..
gl_data.cpp	Merge branch 'master' into v2.x	2014-09-09 01:30:11 +02:00
gl_data.h	- initialize model data at engine start, not at level start.	2014-06-19 15:22:00 +02:00
gl_matrix.cpp	- renamed some stuff that clashed with gl function names.	2014-07-27 12:33:54 +02:00
gl_matrix.h	- remove use of builtin texture matrices.	2014-07-13 20:41:20 +02:00
gl_portaldata.cpp	- fix c++11's compile problems.	2013-08-28 08:33:11 +02:00
gl_setup.cpp	- fix a render glitch with Back to Saturn X MAP06: Do not flood missing upper and lower textures with the backsector's flat if that backsector is malformed (i.e. has no area.)	2014-08-31 23:01:53 +02:00
gl_vertexbuffer.cpp	- lowered requirements of GL 2.x to OpenGL 3.3.	2014-08-19 15:56:33 +02:00
gl_vertexbuffer.h	- lowered requirements of GL 2.x to OpenGL 3.3.	2014-08-19 15:56:33 +02:00