Skip to content

Sync with upstream #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotAlwaysTrue merged 4 commits into from
Jun 19, 2026
Merged

Sync with upstream #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cc7bfb
Set IsRadio if the CanUseVoiceRadio hook is used to change the outcom…
BramvanZijp Jun 16, 2026
ca7f597
v1.13.4.0 (Summer Update 2026 Hotfix 1)
Regalis11 Jun 18, 2026
e09637c
Merge remote-tracking branch 'upstream/master' into develop
evilfactory Jun 18, 2026
0d380af
Merge branch 'develop'
evilfactory Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ protected void ReloadGuiFrame()
{
color = GuiFrameSource.GetAttributeColor("color", Color.White);
}
string style = GuiFrameSource.Attribute("style") == null ? null : GuiFrameSource.GetAttributeString("style", "");
string style = GuiFrameSource.GetAttribute("style") == null ? null : GuiFrameSource.GetAttributeString("style", "");
GuiFrame = new GUIFrame(RectTransform.Load(GuiFrameSource, GUI.Canvas, Anchor.Center), style, color);
GuiFrame.RectTransform.ScreenSpaceOffset = GuiFrameOffset;

Expand Down
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaClient/LinuxClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>1.13.3.1</Version>
<Version>1.13.4.0</Version>
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaClient/MacClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>1.13.3.1</Version>
<Version>1.13.4.0</Version>
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaClient/WindowsClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>1.13.3.1</Version>
<Version>1.13.4.0</Version>
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaServer/LinuxServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>1.13.3.1</Version>
<Version>1.13.4.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaServer/MacServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>1.13.3.1</Version>
<Version>1.13.4.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
Expand Down
1 change: 1 addition & 0 deletions Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ private static bool CanReceive(Client sender, Client recipient, out float distan

if (canUse != null)
{
isRadio = canUse.Value;
return canUse.Value;
}

Expand Down
2 changes: 1 addition & 1 deletion Barotrauma/BarotraumaServer/WindowsServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>1.13.3.1</Version>
<Version>1.13.4.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
Expand Down
11 changes: 11 additions & 0 deletions Barotrauma/BarotraumaShared/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
-------------------------------------------------------------------------------------------------------------------------------------------------
v1.13.4.0 (Summer Update 2026 Hotfix 1)
-------------------------------------------------------------------------------------------------------------------------------------------------

- Fixed a missing gap in the reworked Typhon + other minor fixes.
- Minor visual fixes to Orca 2.
- Adjustments to Azimuth's lighting.
- Tweaked Azimuth's stealth mode circuit to make piloting smoother.
- Fixed "style" attribute in item GuiFrame XML being case-sensitive.
- Fixed battery cells not being visible when charged in a battery or shuttle battery.

-------------------------------------------------------------------------------------------------------------------------------------------------
v1.13.3.1 (Summer Update 2026)
-------------------------------------------------------------------------------------------------------------------------------------------------

Expand Down
Loading