diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj index 9255732bc..60e6af5cd 100644 --- a/Subsurface/Barotrauma.csproj +++ b/Subsurface/Barotrauma.csproj @@ -474,6 +474,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest Designer diff --git a/Subsurface/Content/Items/Tools/tools.png b/Subsurface/Content/Items/Tools/tools.png index c4227b464..423e4025b 100644 Binary files a/Subsurface/Content/Items/Tools/tools.png and b/Subsurface/Content/Items/Tools/tools.png differ diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml index cf9d3c1e5..a9b318614 100644 --- a/Subsurface/Content/Items/Tools/tools.xml +++ b/Subsurface/Content/Items/Tools/tools.xml @@ -8,14 +8,14 @@ price="100" description="One of the most crucial tools on board the submarine. Also works underwater."> - + - + + aimpos="50,0" handle1="-17,0" handle2="10,0"/> @@ -56,14 +56,14 @@ price="100" description="Cuts through various materials using a jet of ionized oxygen."> - + - + - + @@ -136,12 +136,12 @@ pickdistance="200" price="10"> - + - + + holdangle="30" handle1="-10,0"/> @@ -152,12 +152,12 @@ pickdistance="200" price="10"> - + - + + aimpos="50,0" handle1="-5,0" holdangle="30" reload="1.0"> diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs index 1887234ce..3743e5477 100644 --- a/Subsurface/Properties/AssemblyInfo.cs +++ b/Subsurface/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.3.0.0")] -[assembly: AssemblyFileVersion("0.3.0.0")] +[assembly: AssemblyVersion("0.3.0.1")] +[assembly: AssemblyFileVersion("0.3.0.1")] diff --git a/Subsurface/Source/Characters/AI/CrewCommander.cs b/Subsurface/Source/Characters/AI/CrewCommander.cs index 995f1ebe0..cb1acd72c 100644 --- a/Subsurface/Source/Characters/AI/CrewCommander.cs +++ b/Subsurface/Source/Characters/AI/CrewCommander.cs @@ -216,6 +216,15 @@ namespace Barotrauma } } + public void SelectCharacter(Character character) + { + var characterButton = frame.FindChild(character) as GUIButton; + + if (characterButton == null) return; + + characterButton.Selected = true; + } + private bool SetOrder(GUIButton button, object userData) { Order order = userData as Order; diff --git a/Subsurface/Source/GameSession/CrewManager.cs b/Subsurface/Source/GameSession/CrewManager.cs index fe3ec51d4..3ffdd680e 100644 --- a/Subsurface/Source/GameSession/CrewManager.cs +++ b/Subsurface/Source/GameSession/CrewManager.cs @@ -106,6 +106,14 @@ namespace Barotrauma { GameMain.GameSession.CrewManager.commander.ToggleGUIFrame(); + int orderIndex = orderListBox.children.IndexOf(component); + if (orderIndex<0 || orderIndex >= listBox.children.Count) return false; + + var characterFrame = listBox.children[orderIndex]; + if (characterFrame == null) return false; + + GameMain.GameSession.CrewManager.commander.SelectCharacter(characterFrame.UserData as Character); + return false; } diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt index 94c32903a..63e1556d5 100644 --- a/Subsurface/changelog.txt +++ b/Subsurface/changelog.txt @@ -1,4 +1,18 @@ +--------------------------------------------------------------------------------------------------------- +v0.3.0.1 +--------------------------------------------------------------------------------------------------------- + +- fixed inventory not being visible when using character mode in the editor +- adding hulls and gaps works properly when switching to editor after a round has been started +- fixed item selecting when switching to character mode after a round has been started +- fixed a bug that made it impossible to fix broken walls after saving and reloading +- fixed crashing when trying to place ladders when no submarine has been loaded +- trying to generate waypoints for an empty sub won't crash the game anymore +- when opening the crew commander menu for the first time, there's a text notifying about the hotkey for +opening/closing the menu + + --------------------------------------------------------------------------------------------------------- v0.3 --------------------------------------------------------------------------------------------------------- diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index d9f989b89..cc8fc2d12 100644 Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ