Merge remote-tracking branch 'origin/master' into Rendering

2015-12-03 18:15:56 +01:00
parent 1c06c06816 e950dd9206
commit 45a48bbbe5
19 changed files with 1087 additions and 4 deletions
@@ -3,12 +3,11 @@

 #include "Core/ResourceManager.h"
 #include "Core/ConfigFile.h"
-
 #include "Core/EventBroker.h"
 #include "Rendering/Renderer.h"
 #include "Core/InputManager.h"
-
 #include "GUI/Frame.h"
+#include "Core/World.h"

 class Game
 {
@@ -26,6 +25,7 @@ private:
 	IRenderer* m_Renderer;
 	InputManager* m_InputManager;
 	GUI::Frame* m_FrameStack;
+    World* m_World;
 };

-#endif
+#endif