Merge branch 'FMOD'

Conflicts: src/GameWorld.cpp src/Renderer.cpp src/Systems/PhysicsSystem.cpp src/Systems/PhysicsSystem.h src/Systems/SoundSystem.cpp src/Systems/SoundSystem.h vs11/Returngeance/Returngeance.vcxproj vs11/Returngeance/Returngeance.vcxproj.filters
2014-06-02 18:49:16 +02:00
parent 2f2154ffe1 4ac67a22ac
commit 98399c3995
72 changed files with 4778 additions and 6461 deletions
@@ -17,6 +17,7 @@
 #include "Components/Template.h"
 #include "System.h"
 #include "EventBroker.h"
+#include "Events/ComponentCreated.h"
 #include "ResourceManager.h"

 class World