Commit graph

7 commits

Author SHA1 Message Date
230fd6644e Merge branch 'master' into vegetation
Conflicts:
	src/basics/Color.inline.cpp
2015-12-09 00:40:47 +01:00
c12cd91f9b Removed header inlining of Vector3 and Color methods
This made cross-platform compiling and profiling more complicated
2015-12-09 00:32:29 +01:00
394ff3b0ae Format 2015-11-18 17:22:33 +01:00
e2d03642f4 Added some vegetation rendering optimizations 2015-11-10 01:12:14 +01:00
159e0f7e81 Optimized vegetation branches rendering 2015-11-10 00:15:30 +01:00
88d2a78b70 Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
2b3ecc7e35 Added geometry primitives 2015-10-15 20:21:32 +02:00