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

src/Game/Game.cpp

@@ -29,7 +29,7 @@ Game::Game(int argc, char* argv[])
 
 
     // Create the renderer
-    m_Renderer = new Renderer(m_EventBroker, m_World);
+    m_Renderer = new Renderer(m_EventBroker);
     m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
     m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
     m_Renderer->SetResolution(Rectangle::Rectangle(
@@ -64,8 +64,7 @@ Game::Game(int argc, char* argv[])
         EntityFileParser fp(file);
         fp.MergeEntities(m_World);
     }
-    //SO MUCH TEMP PLEASE REMOVE ME OMFG VIKTOR HELP
-    m_Renderer->m_World = m_World;
+
 
     // Create Octrees
     m_OctreeCollision = new Octree(AABB(glm::vec3(-100), glm::vec3(100)), 4);