 Michaël Lemaire
|
eeeaa70e8b
|
Fixed emphasis in docstrings
|
2016-01-06 19:55:49 +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
|
9a096ec329
|
Merge branch 'master' into vegetation
Conflicts:
src/basics/Disk.cpp
src/basics/Disk.h
src/basics/SpaceSegment.cpp
src/definition/DefinitionNode.cpp
src/definition/DefinitionNode.h
src/definition/Scenery.cpp
src/definition/Scenery.h
src/definition/SurfaceMaterial.cpp
src/definition/SurfaceMaterial.h
src/definition/TextureLayerDefinition.cpp
src/definition/definition_global.h
src/interface/commandline/tests.cpp
src/render/opengl/OpenGLRenderer.cpp
src/render/software/SoftwareCanvasRenderer.cpp
src/render/software/SoftwareCanvasRenderer.h
src/render/software/SoftwareRenderer.h
src/render/software/TerrainRasterizer.cpp
src/render/software/TerrainRasterizer.h
src/render/software/TerrainRenderer.h
src/render/software/software_global.h
|
2015-11-09 22:38:00 +01:00 |
|
|
Michaël Lemaire
|
2560fe2c53
|
Fixed holes in vegetation rendering
|
2015-11-02 23:00:02 +01:00 |
|
|
Michaël Lemaire
|
d937bd08f6
|
vegetation: Added basic distribution algorithm
|
2015-10-19 00:30:20 +02:00 |
|
|
Michaël Lemaire
|
48dc1a8f25
|
Refactored vegetation presence
|
2015-10-18 22:15:19 +02:00 |
|