 Michaël Lemaire
|
230fd6644e
|
Merge branch 'master' into vegetation
Conflicts:
src/basics/Color.inline.cpp
|
2015-12-09 00:40:47 +01:00 |
|
|
Michaël Lemaire
|
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 |
|
|
Michaël Lemaire
|
e2d03642f4
|
Added some vegetation rendering optimizations
|
2015-11-10 01:12:14 +01:00 |
|
|
Michaël Lemaire
|
88d2a78b70
|
Enforced coding style using clang-format
|
2015-11-09 22:30:46 +01:00 |
|
|
Michaël Lemaire
|
2b3ecc7e35
|
Added geometry primitives
|
2015-10-15 20:21:32 +02:00 |
|