Unstable 0.15.15.0 (and the one before it I forgor)

2021-11-18 21:34:30 +09:00
parent 10e5fd5f3e
commit 80f39cd2a3
257 changed files with 4916 additions and 2582 deletions
@@ -480,7 +480,7 @@ namespace Barotrauma
                        "\n" + string.Join("\n", contentPackage.ErrorMessages);
                }
            }
-            contentPackageList.CanDragElements = CanHotswapPackages(false);
+            contentPackageList.CurrentDragMode = CanHotswapPackages(false) ? GUIListBox.DragMode.DragWithinBox : GUIListBox.DragMode.NoDragging;
            contentPackageList.CanBeFocused = CanHotswapPackages(false);
            contentPackageList.OnRearranged = OnContentPackagesRearranged;

@@ -1767,7 +1767,7 @@ namespace Barotrauma
            return true;
        }

-        private IEnumerable<object> WaitForKeyPress(GUITextBox keyBox, KeyOrMouse[] keyArray)
+        private IEnumerable<CoroutineStatus> WaitForKeyPress(GUITextBox keyBox, KeyOrMouse[] keyArray)
        {
            yield return CoroutineStatus.Running;