Merge branch 'master' into FrameAttempt

2015-09-17 15:45:08 +02:00
parent 53a9cbd4d8 692e0ca9df
commit f6721986c7
33 changed files with 18573 additions and 80 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"
@@ -19,6 +19,7 @@
 #include "Physics/CCircleShape.h"
 #include "Physics/ESetImpulse.h"
 #include "Rendering/CSprite.h"
+#include "Rendering/CModel.h"
 #include "Game/CBall.h"
 #include "Game/EResetBall.h"
 #include "CPad.h"