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

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -380,9 +380,13 @@ namespace Barotrauma.Items.Components

        public virtual void UpdateHUD(Character character, float deltaTime, Camera cam) { }

-        public ItemComponent GetLinkUIToComponent()
+        public virtual void CreateEditingHUD(SerializableEntityEditor editor)
        {
-            if (string.IsNullOrEmpty(LinkUIToComponent))
+        }
+
+        private bool LoadElemProjSpecific(XElement subElement)
+        {
+            switch (subElement.Name.ToString().ToLowerInvariant())
            {
                case "guiframe":
                    if (subElement.Attribute("rect") != null)