(98f1dbf5e) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:14:58 +03:00
parent 7f72f72ca7
commit b02565796a
22 changed files with 211 additions and 247 deletions
@@ -390,7 +390,7 @@ namespace Barotrauma
if (text[i] == '\n')
{
currentLineX = 0.0f;
retVal.Y += baseHeight * 18 / 10;
retVal.Y += baseHeight * 1.8f;
continue;
}
uint charIndex = text[i];