Merge branch 'master' into CPArrow

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Entities/PlayerRed.xml
2016-03-02 13:58:44 +01:00
parent ab7fd89546 2fb3bb2a39
commit a2b938d8f6
32 changed files with 1394 additions and 535 deletions
@@ -20,6 +20,8 @@ public:
 private:
    EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
    bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<AmmoPickupSystem, Events::AmmoPickup> m_EAmmoPickup;
+    bool OnAmmoPickup(Events::AmmoPickup& e);

    struct NewAmmoPickup {
        glm::vec3 Pos;