Merge remote-tracking branch 'origin/master' into gui

Conflicts: include/Core/Engine.h include/Core/RenderQueue.h include/Core/Renderer.h src/game/Core/Renderer.cpp
2015-09-25 02:27:00 +02:00
parent c9854d2b83 f79d5ec68b
commit d2bc91be48
24 changed files with 1716 additions and 83 deletions
@@ -1879,5 +1879,3 @@ f 166/13/239 259/24/24 401/34/255
 f 161/12/240 166/13/239 400/32/253
 f 163/27/245 161/12/240 399/29/251
 f 256/19/19 163/27/245 398/30/30
-l 300 301
-l 299 298