Commit graph

6 commits

Author SHA1 Message Date
Michaël Lemaire 69543f76b6 Added node watching on "container" nodes 2016-01-16 16:21:02 +01:00
Michaël Lemaire b51ce3426d Fixed coding style 2015-12-16 01:33:02 +01:00
Michaël Lemaire 86e6539af9 Fixed a potential segfault at program exit 2015-12-16 10:36:21 +01:00
Michaël Lemaire 4a710c0977 Merge branch 'master' into vegetation
Conflicts:
	src/interface/commandline/tests.cpp
	src/render/opengl/OpenGLPart.h
	src/render/opengl/OpenGLRenderer.cpp
	src/render/opengl/OpenGLRenderer.h
	src/render/opengl/OpenGLShaderProgram.h
	src/render/opengl/OpenGLSharedState.h
	src/render/software/SoftwareCanvasRenderer.h
2015-12-13 17:16:26 +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