BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/Game/BallSystem.h
	include/Game/ProjectileSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/ProjectileSystem.cpp
	src/game/Rendering/AnimationSystem.cpp
This commit is contained in:
viktorljung
2015-10-23 14:47:04 +02:00
parent 6206859568 9158dd8ef7
commit c1ba6481df
43 changed files with 810 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/BallSystem.h
+1
View File
@@ -49,6 +49,7 @@
#include "Physics/ECreateParticleSequence.h"
#include "Sound/CCollisionSound.h"
#include "Sound/EPlaySound.h"
#include "Rendering/EAnimationComplete.h"
namespace dd