Skip to content

Commit b6239f0

Browse files
committed
2 parents f2945d0 + e4d9313 commit b6239f0

File tree

232 files changed

+703
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+703
-172
lines changed

.github/actions/set_version/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
run: sed -i -E '/c_VersionString = /s/"[^"]*"/"${{inputs.new_release_version}}"/' Source/System/GameVersion.h
1212
shell: bash
1313

14-
- uses: actions/setup-python@v3
14+
- uses: actions/setup-python@v5
1515

1616
- name: Rewrite meson version
1717
run: |

.github/workflows/clang-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727

2828
steps:
2929
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
30-
- uses: actions/checkout@v3
31-
- uses: actions/setup-python@v3
30+
- uses: actions/checkout@v4
31+
- uses: actions/setup-python@v5
3232

3333
- name: Install dependencies
3434
run: |

.github/workflows/meson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
sudo pip install meson
8585
8686
- name: ccache
87-
uses: hendrikmuhs/[email protected].11
87+
uses: hendrikmuhs/[email protected]
8888
with:
8989
key: ${{ github.job }}-${{ matrix.os }}
9090

@@ -191,7 +191,7 @@ jobs:
191191
github_token: ${{ secrets.GITHUB_TOKEN }}
192192

193193
- name: ccache
194-
uses: hendrikmuhs/[email protected].11
194+
uses: hendrikmuhs/[email protected]
195195
with:
196196
key: ${{ github.job }}-${{ matrix.os }}
197197

.github/workflows/msbuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
runs-on: windows-latest
5555

5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858

5959
- name: Add MSBuild to PATH
60-
uses: microsoft/setup-msbuild@v1
60+
uses: microsoft/setup-msbuild@v2
6161

6262
- name: Set Version
6363
if: ${{inputs.new_release_version}}
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Upload Artifact
8383
if: ${{inputs.upload_artefacts}}
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: ${{ steps.executable_name.outputs.EXECUTABLE_NAME }}
8787
path: ${{ steps.executable_name.outputs.EXECUTABLE_NAME }}

.github/workflows/nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
3636
- name: Checkout code
3737
if: ${{ steps.check_manual_run.outputs.needs_build == 'false' }}
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
- name: fetch tags
4141
if: ${{ steps.check_manual_run.outputs.needs_build == 'false' }}
@@ -90,7 +90,7 @@ jobs:
9090

9191
steps:
9292
- name: Checkout code
93-
uses: actions/checkout@v3
93+
uses: actions/checkout@v4
9494

9595
- name: fetch tags
9696
run: git fetch --tags origin

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737

3838
- name: fetch tags
3939
run: git fetch --tags origin

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
<details><summary><b>Added</b></summary>
1010

11+
- New sounds:
12+
New metal gibbing sounds used mainly for robots.
13+
New plastic impact and gib sounds for dummies.
14+
New LightRobot and HeavyRobot foley and footstep sounds, completing update 6.0's light and heavy cloth sounds.
15+
16+
- The pause menu will now muffle the music being played, just like in every modern game ever.
17+
1118
</details>
1219

1320
<details><summary><b>Changed</b></summary>
1421

22+
- Enhanced dropship and engine explosion sounds while still keeping their old vibe.
23+
1524
- Nerfed the Coalition Grenade Launcher and the Devastator a tiny bit. They are still scary and the Devastator can still one-shot most things on a good hit, but they did not need to be that oppressive.
1625

1726
</details>
@@ -22,6 +31,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2231

2332
- Reverted a change to pathfinding, that although was technically accurate, caused issues with the AI being too eager to path up-and-over obstacles instead of through them. In the future this will likely be revisited when we get jump-aware pathfinding.
2433

34+
- Fixed nucleo shots breaking if saving and loading them mid explosion sequence.
35+
36+
- Fixed Dummy Assault resetting funds to their initial value upon loading a saved game.
37+
2538
</details>
2639

2740
<details><summary><b>Removed</b></summary>

Data/Base.rte/Actors/Brains/Brainbot/Brainbot.ini

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,8 @@ AddActor = Arm
410410
MinVelocity = 5
411411
GibImpulseLimit = 240
412412
GibWoundLimit = 8
413+
GibSound = SoundContainer
414+
CopyOf = Metal Gib Limb
413415

414416

415417
AddActor = Arm
@@ -568,6 +570,8 @@ AddActor = Leg
568570
MinVelocity = 5
569571
GibImpulseLimit = 360
570572
GibWoundLimit = 9
573+
GibSound = SoundContainer
574+
CopyOf = Metal Gib Limb
571575

572576

573577
AddActor = Leg
@@ -614,14 +618,14 @@ AddActor = AHuman
614618
Depth = 3
615619
DeepCheck = 0
616620
BodyHitSound = SoundContainer
617-
CopyOf = Metal Body Blunt Hit
621+
CopyOf = Foley Light Robot Impact
618622
PainSound = SoundContainer
619623
CopyOf = Robot Pain
620624
DeathSound = SoundContainer
621625
AddSound = ContentFile
622626
FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.flac
623627
DeviceSwitchSound = SoundContainer
624-
CopyOf = Servo Sound
628+
CopyOf = Foley Light Robot Light
625629
Team = 0
626630
Health = 100
627631
Organic = 1
@@ -677,7 +681,7 @@ AddActor = AHuman
677681
BGFootGroup = AtomGroup
678682
CopyOf = Human Foot
679683
StrideSound = SoundContainer
680-
CopyOf = Robot Stride
684+
CopyOf = Footstep Base Light Robot Generic
681685
StandLimbPath = LimbPath
682686
PresetName = Brainbot Stand Path
683687
StartOffset = Vector
@@ -855,4 +859,6 @@ AddActor = AHuman
855859
MaxVelocity = 10
856860
MinVelocity = 1
857861
GibImpulseLimit = 4300
858-
GibWoundLimit = 20
862+
GibWoundLimit = 20
863+
GibSound = SoundContainer
864+
CopyOf = Metal Gib Torso

Data/Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ AddEffect = AEmitter
4141
MaxVelocity = 5
4242
MinVelocity = 1
4343
BurstSound = SoundContainer
44-
CopyOf = Bone Hit
44+
CopyOf = Plastic Generic Impact
4545
EmissionEnabled = 1
4646
EmissionCountLimit = 10
4747
EmissionsIgnoreThis = 1
@@ -86,7 +86,7 @@ AddEffect = AEmitter
8686
MaxVelocity = 10
8787
MinVelocity = 1
8888
BurstSound = SoundContainer
89-
CopyOf = Metal Penetration Hit
89+
CopyOf = Plastic Exit Sweetener
9090
EmissionEnabled = 1
9191
EmissionCountLimit = 10
9292
EmissionsIgnoreThis = 1
@@ -285,6 +285,9 @@ AddEffect = Attachable
285285
AngularVel = 6
286286
EntryWound = AEmitter
287287
CopyOf = Wound Plastic Green Entry
288+
PresetName = Green Dummy Wound Entry Head
289+
BurstSound = SoundContainer
290+
CopyOf = Plastic Head Impact
288291
ExitWound = AEmitter
289292
CopyOf = Wound Plastic Green Exit
290293
AtomGroup = AtomGroup
@@ -335,7 +338,7 @@ AddEffect = Attachable
335338
GibImpulseLimit = 300
336339
GibWoundLimit = 4
337340
GibSound = SoundContainer
338-
CopyOf = Bone Crack
341+
CopyOf = Plastic Generic Gib Small
339342

340343

341344
AddActor = Arm
@@ -434,7 +437,7 @@ AddActor = Arm
434437
GibImpulseLimit = 185
435438
GibWoundLimit = 3
436439
GibSound = SoundContainer
437-
CopyOf = Bone Crack
440+
CopyOf = Plastic Generic Gib Small
438441

439442

440443
AddActor = Arm
@@ -588,7 +591,7 @@ AddActor = Leg
588591
GibImpulseLimit = 200
589592
GibWoundLimit = 4
590593
GibSound = SoundContainer
591-
CopyOf = Bone Crack
594+
CopyOf = Plastic Generic Gib Small
592595

593596

594597
AddActor = Leg
@@ -646,7 +649,7 @@ AddActor = AHuman
646649
DeathSound = SoundContainer
647650
CopyOf = Robot Death
648651
DeviceSwitchSound = SoundContainer
649-
CopyOf = Servo Sound
652+
CopyOf = Foley Light Robot Light
650653
Health = 100
651654
Mechanical = 1
652655
ImpulseDamageThreshold = 2500
@@ -700,7 +703,7 @@ AddActor = AHuman
700703
BGFootGroup = AtomGroup
701704
CopyOf = Human Foot
702705
StrideSound = SoundContainer
703-
CopyOf = Robot Stride
706+
CopyOf = Footstep Base Light Robot Generic
704707
StandLimbPath = LimbPath
705708
PresetName = Green Dummy Stand Path
706709
StartOffset = Vector
@@ -778,4 +781,4 @@ AddActor = AHuman
778781
GibImpulseLimit = 3000
779782
GibWoundLimit = 6
780783
GibSound = SoundContainer
781-
CopyOf = Bone Crack
784+
CopyOf = Plastic Generic Gib Large

Data/Base.rte/Actors/Mecha/AADrone/Drone.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ AddActor = ACrab
414414
RightFootGroup = AtomGroup
415415
CopyOf = Crab Foot
416416
StrideSound = SoundContainer
417-
CopyOf = Robot Stride
417+
CopyOf = Footstep Light Metal Generic
418418
LeftStandLimbPath = LimbPath
419419
PresetName = AA Drone Stand Path Left
420420
StartOffset = Vector

0 commit comments

Comments
 (0)