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

# Conflicts: # resources/Schema/Entities/Player.xml # resources/Schema/Types/Entity.xsd
2016-02-12 02:30:38 +01:00
parent bee0630a26 6442254575
commit 47053285c8
16 changed files with 335 additions and 12 deletions
@@ -168,6 +168,7 @@ void Renderer::SortRenderJobsByDepth(RenderScene &scene)
    //Sort all forward jobs so transparency is good.
    scene.Jobs.TransparentObjects.sort(Renderer::DepthSort);
    scene.Jobs.SpriteJob.sort(Renderer::DepthSort);
+    scene.Jobs.Text.sort(Renderer::DepthSort);
 }

 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)