Merge branch 'master' into PlayerMovement

# Conflicts: # src/Engine/Rendering/RenderSystem.cpp # src/Game/Game.cpp
2016-01-14 18:21:32 +01:00
parent 5e721325a4 627108c6ee
commit 567173c565
4 changed files with 59 additions and 54 deletions
@@ -186,5 +186,4 @@ void RenderSystem::updateCamera(World* world, double dt)
    }

    m_Camera->UpdateViewMatrix();
-}
-
+}