Merge branch 'master' into master-1.0.6

This commit is contained in:
NotAlwaysTrue
2025-12-28 14:00:03 +08:00
committed by GitHub
6 changed files with 17 additions and 10 deletions

View File

@@ -23,13 +23,16 @@ on:
env: env:
CI_DIR: 2049ef39-42a2-46d2-b513-ee6d2e3a7b15 CI_DIR: 2049ef39-42a2-46d2-b513-ee6d2e3a7b15
RELEASES: | RELEASES: |
windows:client:Windows/Client
windows:server:Windows/Server windows:server:Windows/Server
linux:client:Linux/Client
linux:server:Linux/Server linux:server:Linux/Server
mac:client:Mac/Client/Barotrauma.app/Contents/MacOS
mac:server:Mac/Server mac:server:Mac/Server
ARCHIVE_BASE_NAME: luacsforbarotrauma ARCHIVE_BASE_NAME: luacsforbarotraumaEP
# windows:client:Windows/Client
# linux:client:Linux/Client
# mac:client:Mac/Client/Barotrauma.app/Contents/MacOS
# we do not currently provide a CL
# XXX: these file names are subject to shell expansion. # XXX: these file names are subject to shell expansion.
# Be careful when using special characters. # Be careful when using special characters.
ARCHIVE_FILES_SERVER: | ARCHIVE_FILES_SERVER: |
@@ -211,4 +214,4 @@ jobs:
files: | files: |
${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_{build,patch}_{windows,linux,mac}_{client,server}.zip ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_{build,patch}_{windows,linux,mac}_{client,server}.zip
${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_{build,patch}_linux_{client,server}.tar.gz ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_{build,patch}_linux_{client,server}.tar.gz
${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_refs.zip ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_refs.zip

View File

@@ -8,6 +8,9 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using static Barotrauma.EosInterface.Ownership; using static Barotrauma.EosInterface.Ownership;
// DO NOT TOUCH ANYTHING HERE
// OR EVERYTHING WILL FAIL
namespace Barotrauma.Networking namespace Barotrauma.Networking
{ {
class ServerEntityEvent : NetEntityEvent class ServerEntityEvent : NetEntityEvent

View File

@@ -3,11 +3,12 @@ using Barotrauma.Items.Components;
using FarseerPhysics; using FarseerPhysics;
using FarseerPhysics.Dynamics; using FarseerPhysics.Dynamics;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using MoonSharp.Interpreter;
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Xml.Linq; using System.Xml.Linq;
using MoonSharp.Interpreter;
namespace Barotrauma namespace Barotrauma
{ {

View File

@@ -162,13 +162,13 @@ namespace Barotrauma
}); });
GameMain.GameSession?.Update((float)deltaTime); GameMain.GameSession?.Update((float)deltaTime);
foreach (PhysicsBody body in physicsBodies) Parallel.ForEach(physicsBodies, parallelOptions, body =>
{ {
if (body.Enabled && body.BodyType != BodyType.Static) if (body.Enabled && body.BodyType != BodyType.Static)
{ {
body.SetPrevTransform(body.SimPosition, body.Rotation); body.SetPrevTransform(body.SimPosition, body.Rotation);
} }
} });
MapEntity.ClearHighlightedEntities(); MapEntity.ClearHighlightedEntities();

View File

@@ -1409,4 +1409,4 @@ namespace FarseerPhysics.Dynamics
return body; return body;
} }
} }
} }

View File

@@ -1,4 +1,4 @@
# LuaCsForBarotrauma Enhanced Performence Project # LuaCsForBarotrauma Enhanced Performance Project
> ⚠ **Warning** This release is only available for server-side use and is not recommended to run on the client. Make sure that compatibility is adequately tested before deployment. > ⚠ **Warning** This release is only available for server-side use and is not recommended to run on the client. Make sure that compatibility is adequately tested before deployment.