(b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix

2019-04-25 17:51:10 +03:00
parent 52991e1ded
commit 99344e4031
3 changed files with 1 additions and 65 deletions
@@ -132,7 +132,7 @@ namespace Barotrauma
        //default size
        protected Vector2 size;                

-        private List<XElement> fabricationRecipeElements = new List<XElement>();
+        private float impactTolerance;

        private bool canSpriteFlipX, canSpriteFlipY;