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

# Conflicts: # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/RenderSystem.h # include/Game/Game.h # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderSystem.cpp
2016-01-18 17:44:26 +01:00
parent 92553f1e93 bf3f8aea89
commit 2a93e2ae7f
159 changed files with 4202 additions and 990 deletions
@@ -17,10 +17,9 @@ Font::Font(std::string path)
        it++;
        if (it != tok.end()) {
            try {
-                LOG_INFO("DFhdoölshöldsihjgf");
                fontSize = boost::lexical_cast<int>((*it).c_str());
            } catch (boost::bad_lexical_cast const&) {
-                std::cout << "Error: input string was not valid" << std::endl;
+                LOG_ERROR("input string did not have a valid font resolution");
            }
        }
    } else {
@@ -28,7 +27,6 @@ Font::Font(std::string path)
    }


-
    FT_Library library;

    if (FT_Init_FreeType(&library)) {