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

# Conflicts: # src/Engine/Rendering/Texture.cpp # src/Game/Game.cpp
2016-02-11 14:43:30 +01:00
parent 350effd8eb bbbab7b287
commit f0ae365401
106 changed files with 4052 additions and 940 deletions
@@ -51,7 +51,7 @@ void Renderer::InitializeWindow()
 	ss << " DEBUG";
 #endif
 	LOG_INFO(ss.str().c_str());
-	glfwSetWindowTitle(m_Window, ss.str().c_str());
+    SetWindowTitle(ss.str());

 	// Initialize GLEW
 	if (glewInit() != GLEW_OK) {