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

2015-10-20 11:53:05 +02:00
parent b38fdf2183 dd6c5443eb
commit b4f098c80d
30 changed files with 1422 additions and 27 deletions
@@ -23,6 +23,7 @@
 #include "Game/EHitPad.h"
 #include "Game/CProjectile.h"
 #include "Game/CBall.h"
+#include "Rendering/CSprite.h"
 #include <fstream>
 #include <iostream>