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

Conflicts: src/GameWorld.cpp src/Systems/ParticleSystem.cpp
2014-05-27 06:55:44 +02:00
parent 65acae410d 1bf5a8464e
commit 4b2f324d60
84 changed files with 3719 additions and 1153 deletions
@@ -54,7 +54,7 @@ private:

 	bool tempSpawnedExplosions;
 	
-	EventRelay<Events::KeyUp> m_EKeyUp;
+	EventRelay<ParticleSystem, Events::KeyUp> m_EKeyUp;
 	bool OnKeyUp(const Events::KeyUp &e);

 };