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

2015-09-16 16:29:57 +02:00
parent 8f513e3281 c311408346
commit 30ee6c2430
26 changed files with 18430 additions and 66 deletions
@@ -8,6 +8,7 @@
 #include "Core/System.h"
 #include "Core/CTransform.h"
 #include "Rendering/CSprite.h"
+#include "Rendering/CModel.h"
 #include "Game/CBrick.h"
 #include "Core/EventBroker.h"
 #include "Core/World.h"