graphics/paysages3d
1
0
Fork 0
Code Releases Activity
paysages3d/src
History
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
..
basics Merge branch 'master' into vegetation 2015-11-09 22:38:00 +01:00
definition Merge branch 'master' into vegetation 2015-11-09 22:38:00 +01:00
experiments/bruneton Merge branch 'master' into vegetation 2015-11-09 22:38:00 +01:00
interface Merge branch 'master' into vegetation 2015-11-09 22:38:00 +01:00
render Merge branch 'master' into vegetation 2015-11-09 22:38:00 +01:00
system Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
tests Merge branch 'master' into vegetation 2015-11-09 22:38:00 +01:00
.clang-format Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
common.pri Renaming editing -> interface/desktop 2013-11-14 21:46:47 +01:00
paysages.pro Removed unused preview renderers 2015-08-12 22:53:54 +02:00