Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
@@ -27,7 +27,6 @@ private:
        double HealthGain;
        double RespawnTimer;
        double DecreaseThisRespawnTimer;
-        EntityID parentID;
    };
    std::vector<NewHealthPickup> m_ETriggerTouchVector;
 };