(65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-27 20:54:53 +02:00
parent 6ca760ceda
commit 81833e7920
11 changed files with 692 additions and 100 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;