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
@@ -42,9 +42,9 @@ private:
    int m_NumberOfCapturePoints = 0;
    std::map<int, EntityWrapper> m_CapturePointNumberToEntityMap;

+    //std::vector<ComponentWrapper>
+
    bool m_ResetTimers = false;
-    bool m_RecentlyCapturedNeedNextCapturePointNow = false;
-    Events::Captured m_CapturedEvent;

    //vectors which will keep track of enter/leave changes
    std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerTouchVector;