Merge branch 'Physics'

2015-10-22 15:36:53 +02:00
parent 3fb85cd049 80ba2a0c32
commit 0900172bf2
21 changed files with 24728 additions and 1803 deletions
@@ -33,6 +33,8 @@
 #include "Game/CBall.h"
 #include "Game/CProjectile.h"
 #include "Sound/CCollisionSound.h"
+#include "Rendering/CAnimation.h"
+#include "Rendering/CSprite.h"
 //#include "Core/Camera.h" Camera Component