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

2015-09-23 15:14:16 +02:00
parent 03e2078cfb 3f4ede4b7d
commit 08d653b0b0
25 changed files with 2834 additions and 6 deletions
@@ -23,6 +23,7 @@
 #include "Physics/CCircleShape.h"
 #include "Physics/ESetImpulse.h"
 #include "Physics/EContact.h"
+#include "Sound/CCollisionSound.h"
 #include <fstream>
 #include <iostream>
 #include <intrin.h>