(d8c40ca6c) Merge branch 'dev' into tutorial-rework

2019-03-27 20:54:27 +02:00
parent 86ded4b1d5
commit ac60c9477e
12 changed files with 681 additions and 113 deletions
@@ -68,6 +68,14 @@ namespace Barotrauma

        private float dropItemAnimDuration = 0.5f;
        private float dropItemAnimTimer;
+
+        public Item DroppedItem
+        {
+            get
+            {
+                return droppedItem;
+            }
+        }
        private Item droppedItem;

        private GUIComponent draggingMed;