(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -132,14 +132,16 @@ namespace Barotrauma
        //default size
        protected Vector2 size;                

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

        private bool canSpriteFlipX, canSpriteFlipY;
        
        private Dictionary<string, PriceInfo> prices;

-        //an area next to the construction
-        //the construction can be Activated() by a Character inside the area
+        /// <summary>
+        /// Defines areas where the item can be interacted with. If RequireBodyInsideTrigger is set to true, the character
+        /// has to be within the trigger to interact. If it's set to false, having the cursor within the trigger is enough.
+        /// </summary>
        public List<Rectangle> Triggers;

        private List<XElement> fabricationRecipeElements = new List<XElement>();