3 commits

Author	SHA1	Message	Date
Michaël Lemaire	9196be4c05	Merge branch 'master' into vegetation ... Conflicts: src/render/opengl/OpenGLShaderProgram.cpp src/render/opengl/OpenGLShaderProgram.h src/render/opengl/opengl_global.h	2015-12-08 01:28:15 +01:00
Michaël Lemaire	d2efb599d9	Made the vegetation impostors face the camera	2015-11-29 19:18:36 +01:00
Michaël Lemaire	9d7a7a0ff7	Added vegetation impostors to OpenGL renderer ... This is currently an unoptimized and broken version, to be improved	2015-11-25 23:15:58 +01:00