paysages3d/src
Michaël Lemaire e346f07c22 Merge branch 'master' into vegetation
Conflicts:
	src/render/opengl/OpenGLRenderer.cpp
	src/render/opengl/OpenGLRenderer.h
	src/render/opengl/OpenGLShaderProgram.cpp
	src/render/opengl/OpenGLShaderProgram.h
	src/render/opengl/OpenGLSharedState.cpp
2015-12-04 00:04:07 +01:00
..
basics Added vegetation impostors to OpenGL renderer 2015-11-25 23:15:58 +01:00
definition Merge branch 'master' into vegetation 2015-12-04 00:04:07 +01:00
experiments/bruneton Format 2015-11-18 17:22:33 +01:00
interface Merge branch 'master' into vegetation 2015-12-04 00:04:07 +01:00
render Merge branch 'master' into vegetation 2015-12-04 00:04:07 +01:00
system Fixed small memory leaks and uninitialized values 2015-11-24 00:58:09 +01:00
tests Better OpenGL error checking + opengl header refactoring 2015-12-03 23:04:50 +01:00
.clang-format Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
common.pri Switched to C++-14 2015-11-20 01:04:21 +01:00
paysages.pro Removed unused preview renderers 2015-08-12 22:53:54 +02:00