vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

Browse Source
This commit is contained in:
EvilFactory
2022-09-30 12:14:01 -03:00
parent 6c38a555bb d461d504dc
commit a3eff91c1a
10 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs
View File

@@ -127,9 +127,8 @@ namespace Barotrauma.Networking
DebugConsole.ThrowError(errorMsg);
}
ContentPackageOrderReceived = true;
SendMsgInternal(headers, null);
}
SendMsgInternal(headers, null);
break;
}

2
Barotrauma/BarotraumaClient/LinuxClient.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.19.8.0</Version>
<Version>0.19.9.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>

2
Barotrauma/BarotraumaClient/MacClient.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.19.8.0</Version>
<Version>0.19.9.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>

2
Barotrauma/BarotraumaClient/WindowsClient.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.19.8.0</Version>
<Version>0.19.9.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>

4
Barotrauma/BarotraumaServer/LinuxServer.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>0.19.8.0</Version>
<Version>0.19.9.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
@@ -150,4 +150,4 @@
<WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
</Target>
</Project>
</Project>

4
Barotrauma/BarotraumaServer/MacServer.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>0.19.8.0</Version>
<Version>0.19.9.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
@@ -162,4 +162,4 @@
<WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
</Target>
</Project>
</Project>

4
Barotrauma/BarotraumaServer/WindowsServer.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>0.19.8.0</Version>
<Version>0.19.9.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
@@ -158,4 +158,4 @@
<WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
</Target>
</Project>
</Project>

10
Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs
View File

@@ -348,11 +348,15 @@ namespace Barotrauma
completed =
DetermineCompleted() &&
(completeCheckDataAction == null ||completeCheckDataAction.GetSuccess());
if (Prefab.LocationTypeChangeOnCompleted != null)
if (completed)
{
ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
if (Prefab.LocationTypeChangeOnCompleted != null)
{
ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
}
GiveReward();
}
GiveReward();
EndMissionSpecific(completed);
}

1
Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
View File

@@ -3216,6 +3216,7 @@ namespace Barotrauma
}
#endif
item.condition = element.GetAttributeFloat("condition", item.condition);
foreach (XAttribute attribute in (appliedSwap?.ConfigElement ?? element).Attributes())
{
if (!item.SerializableProperties.TryGetValue(attribute.NameAsIdentifier(), out SerializableProperty property)) { continue; }

10
Barotrauma/BarotraumaShared/changelog.txt
View File

@@ -1,3 +1,13 @@
---------------------------------------------------------------------------------------------------------
v0.19.9.0
---------------------------------------------------------------------------------------------------------
Fixes to new issues in the previous build:
- Fixed missions always giving rewards even if you fail them!
- Fixed clients sometimes failing to reconnect to the server if the connection is momentarily lost.
- Fixed item conditions resetting to 100% between rounds.
- Fixed mineral missions always causing a crash.
---------------------------------------------------------------------------------------------------------
v0.19.8.0
---------------------------------------------------------------------------------------------------------