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
@@ -8,6 +8,7 @@
 #include "Core/EventBroker.h"
 #include "Rendering/Renderer.h"
 #include "Core/InputManager.h"
+#include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
@@ -34,9 +35,6 @@
 #include "Sound/SoundManager.h"
 #include "Systems/SoundSystem.h"

-//Performance 
-#include "Core/PerformanceTimer.h"
-
 class Game
 {
 public:
@@ -55,6 +53,7 @@ private:
 	IRenderer* m_Renderer;
 	InputManager* m_InputManager;
    InputProxy* m_InputProxy;
+	GUI::Frame* m_FrameStack;
    World* m_World;
    Octree<EntityAABB>* m_OctreeCollision;
    Octree<EntityAABB>* m_OctreeTrigger;