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

# Conflicts: # resources/Schema/Components.xsd
2016-02-05 16:23:22 +01:00
parent 66f442f1af ff26e1235c
commit be628d9406
35 changed files with 2184 additions and 157 deletions
@@ -20,4 +20,5 @@ private:

    EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
    bool OnPlayerSpawned(Events::PlayerSpawned& e);
+
 };