Merge remote-tracking branch 'barotrauma/master' into lighting-optimization

2017-03-01 15:02:23 -03:00
parent 1f607c2018 708a67caeb
commit f2db3c6b20
16 changed files with 151 additions and 68 deletions
@@ -8,7 +8,7 @@ with.
 <XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
  <Asset Type="Graphics:FontDescription">

-    <FontName>Exo Light</FontName>
+    <FontName>Exo 2 Light</FontName>

    <Size>9</Size>

@@ -11,7 +11,7 @@ with.
    <!--
    Modify this string to change the font that will be imported.
    -->
-    <FontName>Exo Medium</FontName>
+    <FontName>Exo 2 Medium</FontName>

    <!--
    Size is a float value, measured in points. Modify this value to change