Merge pull request #113 from teamfisk/Menu-Tobias

Menu tobias
2016-02-19 13:16:50 +01:00
parent a141da3d8c 6e5335a266
commit 2ac584bafb
36 changed files with 1044 additions and 664 deletions
@@ -8,7 +8,6 @@
 #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"
@@ -56,7 +55,6 @@ 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;