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

2016-03-01 20:33:30 +01:00
parent 6281e20000 9747a201b7
commit a38c18fd3a
32 changed files with 552 additions and 268 deletions
@@ -54,7 +54,7 @@ Game::Game(int argc, char* argv[])
    m_EventBroker = new EventBroker();

    // Create the renderer
-    m_Renderer = new Renderer(m_EventBroker);
+    m_Renderer = new Renderer(m_EventBroker, m_Config);
    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(