diff --git a/Subsurface/Content/InfoTexts.xml b/Subsurface/Content/InfoTexts.xml index f75fc8a67..9e8e83c1a 100644 --- a/Subsurface/Content/InfoTexts.xml +++ b/Subsurface/Content/InfoTexts.xml @@ -19,6 +19,6 @@ You have suffocated. You have been crushed by water pressure. You have burned to death. - You have been disconnected from the server. + You have been disconnected from the server. \ No newline at end of file diff --git a/Subsurface/Source/Characters/CharacterHUD.cs b/Subsurface/Source/Characters/CharacterHUD.cs index 2f4f5fe5b..b4ae4ed91 100644 --- a/Subsurface/Source/Characters/CharacterHUD.cs +++ b/Subsurface/Source/Characters/CharacterHUD.cs @@ -193,6 +193,7 @@ namespace Barotrauma suicideButton.OnClicked = (button, userData) => { + GUIComponent.MouseOn = null; if (Character.Controlled != null) { Character.Controlled.Kill(Character.Controlled.CauseOfDeath); diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs index a934069db..1d5c52f84 100644 --- a/Subsurface/Source/DebugConsole.cs +++ b/Subsurface/Source/DebugConsole.cs @@ -58,9 +58,12 @@ namespace Barotrauma frame.Color = Color.White * 0.4f; frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f); - listBox = new GUIListBox(new Rectangle(0,0,0, frame.Rect.Height-40), Color.Black*0.9f, GUI.Style, frame); + listBox = new GUIListBox(new Rectangle(0, 0, 0, frame.Rect.Height - 40), Color.Black, GUI.Style, frame); + listBox.Color = Color.Black * 0.7f; + + textBox = new GUITextBox(new Rectangle(0,0,0,20), Color.Black, Color.White, Alignment.BottomLeft, Alignment.Left, GUI.Style, frame); + textBox.Color = Color.Black * 0.7f; - textBox = new GUITextBox(new Rectangle(0,0,0,20), Color.Black*0.6f, Color.White, Alignment.BottomLeft, Alignment.Left, GUI.Style, frame); NewMessage("Press F3 to open/close the debug console", Color.Cyan); NewMessage("Enter ''help'' for a list of available console commands", Color.Cyan); diff --git a/Subsurface/Source/GUI/GUIListBox.cs b/Subsurface/Source/GUI/GUIListBox.cs index 7943a2867..0573a458c 100644 --- a/Subsurface/Source/GUI/GUIListBox.cs +++ b/Subsurface/Source/GUI/GUIListBox.cs @@ -84,6 +84,20 @@ namespace Barotrauma set { enabled = value; } } + public override Color Color + { + get + { + return base.Color; + } + set + { + base.Color = value; + + frame.Color = value; + } + } + public bool ScrollBarEnabled { get { return scrollBarEnabled; } diff --git a/Subsurface/Source/Utils/ToolBox.cs b/Subsurface/Source/Utils/ToolBox.cs index 49c1af3de..09bb2330c 100644 --- a/Subsurface/Source/Utils/ToolBox.cs +++ b/Subsurface/Source/Utils/ToolBox.cs @@ -413,7 +413,7 @@ namespace Barotrauma public static string SecondsToReadableTime(float seconds) { - if (seconds <= 60.0f) + if (seconds < 60.0f) { return (int)seconds + " s"; } diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt index ab3f17f0b..4a08e6ad6 100644 --- a/Subsurface/changelog.txt +++ b/Subsurface/changelog.txt @@ -1,3 +1,54 @@ +--------------------------------------------------------------------------------------------------------- +v0.4.2.0 +--------------------------------------------------------------------------------------------------------- + +Support for multiple submarines (no full-fledged submarine vs submarine battles yet, but they're coming +up in future updates!): + - Submarine files can be "merged", i.e. submarines can consist of multiple separate parts which can + be docked into each other + - the multiplayer mode has a "respawn shuttle" which transports respawned players from the entrance + to the main submarine + - parts of the submarine and characters inside them can be left behind in the single player mode + (and later salvaged if you wish to do so) + +Multiplayer: + - fixed a bunch of bugs that caused entity IDs not to match between the clients and the server (which + caused severe syncing issues) + - fixed monster inventory syncing (although atm husks are the only monsters with an inventory) + - fixed server description box not being synced with clients + - search bar for server logs + - more server options + - fixed the occasional "queue empty" error messages when attempting to send submarine files to players + - characters can't be freely named anymore - they'll have the same name as the client + +Items: + - items can be equipped/unequipped by double clicking + - longer railgun view distance + - changes to the logic that determines which item is being highlighted - now it's much easier to + select specific items in cramped subs + - highlighted items glow (so it's easier to see which item you're targeting in the dark) + - fixed an electricity bug that sometimes caused parts of the grid to not carry any power after + a junction box has been broken and repaired + - option to choose the output of a signal check component when the signal doesn't match + - fixed fire extinquishers + - item search bar in the submarine editor + - fixed cargo items spawning in incorrect positions (which occasionally caused some serious problems + if the item happened to be a crate full of nitroglycerin) + + +- the mass of a submarine depends on its size - larger submarines require more force to move around +(custom subs may need some modifications to get the top speeds of the smaller/larger subs back to a +steerable level) + +- changes to depth damage logic: structures with more health need more pressure before they start taking +damage (i.e. submarines with thicker walls and no windows can go deeper) +- fixed flashes from explosions/sparks/flares occasionally ''staying on'' +- NPCs won't close doors/hatches on themselves and are better at handling stairs/ladders +- pathfinding bugfixes +- stunned characters can't move items in their inventory +- characters can run while grabbing/dragging someone + + --------------------------------------------------------------------------------------------------------- v0.4.1.6 ---------------------------------------------------------------------------------------------------------