Compare commits

..

5 Commits

Author SHA1 Message Date
Matthias Mailänder
fc94d93fc8 Bump checkout action.
(cherry picked from commit b0aea7b810)
2023-02-17 12:01:30 +02:00
Matthias Mailänder
810ba2c9ae Bump setup .NET action.
(cherry picked from commit f65c3a09db)
2023-02-17 12:01:27 +02:00
Paul Chote
77190ed1ac Disable max order length check for local servers.
(cherry picked from commit 947f53a991)
2023-02-14 09:35:46 +01:00
abcdefg30
b543f738db Adjust the encyclopedia descriptions of combat tanks
(cherry picked from commit 835537fcc2)
2023-02-14 09:35:46 +01:00
abcdefg30
40a9b47b44 Adjust the encyclopedia descriptions of light armored units
(cherry picked from commit 08ba35763c)
2023-02-14 09:35:46 +01:00
6 changed files with 27 additions and 27 deletions

View File

@@ -12,10 +12,10 @@ jobs:
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
@@ -35,7 +35,7 @@ jobs:
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Check Code
run: |
@@ -53,10 +53,10 @@ jobs:
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'

View File

@@ -15,12 +15,12 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.tag }}
- name: Install .NET 6
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
@@ -29,7 +29,7 @@ jobs:
make all
- name: Clone Wiki
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: openra/openra.wiki
token: ${{ secrets.DOCS_TOKEN }}
@@ -66,12 +66,12 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.tag }}
- name: Install .NET 6
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
@@ -81,7 +81,7 @@ jobs:
- name: Clone docs.openra.net (Playtest)
if: startsWith(github.event.inputs.tag, 'playtest-')
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: openra/docs
token: ${{ secrets.DOCS_TOKEN }}
@@ -90,7 +90,7 @@ jobs:
- name: Clone docs.openra.net (Release)
if: startsWith(github.event.inputs.tag, 'release-')
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: openra/docs
token: ${{ secrets.DOCS_TOKEN }}

View File

@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Prepare Environment
run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
@@ -37,10 +37,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
@@ -66,10 +66,10 @@ jobs:
runs-on: macos-11
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
@@ -101,10 +101,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'

View File

@@ -8,7 +8,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Linguini.Bundle" Version="0.3.1" />
<PackageReference Include="OpenRA-Eluant" Version="1.0.20" />
<PackageReference Include="OpenRA-Eluant" Version="1.0.19" />
<PackageReference Include="Mono.NAT" Version="3.0.3" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />

View File

@@ -115,7 +115,7 @@ namespace OpenRA.Server
frame = BitConverter.ToInt32(bytes, 4);
state = ReceiveState.Data;
if (expectLength < 0 || expectLength > MaxOrderLength)
if (expectLength < 0 || (server.Type != ServerType.Local && expectLength > MaxOrderLength))
{
Log.Write("server", $"Closing socket connection to {EndPoint} because of excessive order length: {expectLength}");
return;

View File

@@ -20,7 +20,7 @@ mcv:
Armor:
Type: light
Encyclopedia:
Description: The Mobile Construction Vehicle must be driven to a suitable deployment area. After locating an appropriate area of rock, the MCV can be transformed into a Construction Yard.\n\nMCVs are resistant to bullets and some high explosives. They are vulnerable to missiles and high caliber guns.
Description: The Mobile Construction Vehicle must be driven to a suitable deployment area. After locating an appropriate area of rock, the MCV can be transformed into a Construction Yard.\n\nMCVs are resistant to bullets and light explosives. They are vulnerable to missiles and high caliber guns.
Order: 180
Category: Units
Mobile:
@@ -192,7 +192,7 @@ quad:
Weapon: Rocket
LocalOffset: 128,64,64, 128,-64,64
Encyclopedia:
Description: Stronger than the Trike in both armor and firepower, the Quad is a four-wheeled vehicle firing armor-piercing rockets. The Quad is effective against most vehicles.\n\nQuads are resistant to bullets and high explosives, to a lesser degree. However, Quads are vulnerable to missiles and high caliber guns.
Description: Stronger than the Trike in both armor and firepower, the Quad is a four-wheeled vehicle firing armor-piercing rockets. The Quad is effective against most vehicles.\n\nQuads are resistant to bullets and explosives, to a lesser degree. However, Quads are vulnerable to missiles and high caliber guns.
Order: 110
Category: Units
AttackFrontal:
@@ -227,7 +227,7 @@ siege_tank:
Armor:
Type: light
Encyclopedia:
Description: Siege Tanks are very effective against infantry and lightly armored vehicles - but very weak against heavily armored targets. They fire over a long range.\n\nSiege Tanks are resistant to bullets, and to some degree, high explosives. These units are vulnerable to missiles and high caliber guns.
Description: Siege Tanks are very effective against infantry and lightly armored vehicles - but very weak against heavily armored targets. They fire over a long range.\n\nSiege Tanks are resistant to bullets, and to some degree, explosives. These units are vulnerable to missiles and high caliber guns.
Order: 170
Category: Units
Mobile:
@@ -341,7 +341,7 @@ sonic_tank:
Weapon: Sound
LocalOffset: 600,0,427
Encyclopedia:
Description: The Sonic Tank is most effective against infantry and lightly armored vehicles - but weaker against armored targets.\n\nThe Sonic Tank will damage all units in its firing path.\n\nThey are very resistant to bullets and high explosives, but vulnerable to missiles and high caliber guns.
Description: The Sonic Tank is most effective against infantry and lightly armored vehicles - but weaker against armored targets.\n\nThe Sonic Tank will damage all units in its firing path.\n\nThey are very resistant to bullets and small explosives, but vulnerable to missiles and high caliber guns.
Order: 200
Category: Units
AttackFrontal:
@@ -626,7 +626,7 @@ combat_tank_h:
Tooltip:
Name: Harkonnen Combat Tank
Encyclopedia:
Description: The Combat Tank is effective against most vehicles, less so against lightly armored vehicles.\n\nThe Harkonnen Combat Tank is stronger but slower.
Description: The Combat Tank is effective against most vehicles, less so against lightly armored vehicles.\n\nThe Harkonnen Combat Tank is stronger than its counterparts, but also slower.
Order: 160
Category: Units
Buildable:
@@ -649,7 +649,7 @@ combat_tank_o:
Turreted:
TurnSpeed: 20
Encyclopedia:
Description: The Combat Tank is effective against most vehicles, less so against lightly armored vehicles.\n\nThe Ordos Combat Tank is faster but weaker.
Description: The Combat Tank is effective against most vehicles, less so against lightly armored vehicles.\n\nThe Ordos Combat Tank is the fastest variant of the Combat Tank, but it is also the weakest.
Order: 150
Category: Units
Armament: