Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 08df53b

Browse files
garethyrgarethyr
authored
Merge branch 'development' into 4zK-content
2 parents abdc5bf + f0400f4 commit 08df53b

File tree

605 files changed

+1547
-264
lines changed

Some content is hidden

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

605 files changed

+1547
-264
lines changed

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Linker output
2+
*.ilk
3+
14
# Compiled Lua sources
25
luac.out
36

@@ -60,4 +63,5 @@ LogPublish.txt
6063
LogLoading.txt
6164
LogConsole.txt
6265
Console.dump.log
63-
Console.input.log
66+
Console.input.log
67+
Base.rte/LoadoutsP1.ini

‎Base.rte/Devices/Explosives/AntiPersonnelMine/AntiPersonnelMine.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ AddEffect = MOSRotating
125125
Path = Base.rte/Sounds/Explosions/Explode1.wav
126126
AddSample = ContentFile
127127
Path = Base.rte/Sounds/Explosions/Explode2.wav
128+
AddSample = ContentFile
129+
Path = Base.rte/Sounds/Explosions/Explode3.wav
128130
AddGib = Gib
129131
GibParticle = MOPixel
130132
CopyOf = Glow Explosion Huge

‎Base.rte/Devices/Explosives/BlueBomb/BlueBomb.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ AddDevice = TDExplosive
4848
Path = Base.rte/Sounds/Explosions/Explode1.wav
4949
AddSample = ContentFile
5050
Path = Base.rte/Sounds/Explosions/Explode2.wav
51+
AddSample = ContentFile
52+
Path = Base.rte/Sounds/Explosions/Explode3.wav
5153
StanceOffset = Vector
5254
X = 8
5355
Y = 5

‎Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ AddMOSRotating = MOSRotating
167167
FilePath = Base.rte/Sounds/Explosions/Explode1.wav
168168
AddSample = ContentFile
169169
FilePath = Base.rte/Sounds/Explosions/Explode2.wav
170+
AddSample = ContentFile
171+
FilePath = Base.rte/Sounds/Explosions/Explode3.wav
170172
AddGib = Gib
171173
GibParticle = MOPixel
172174
CopyOf = Glow Explosion Huge

‎Base.rte/Devices/Explosives/StandardBomb/StandardBomb.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ AddDevice = TDExplosive
4444
Path = Base.rte/Sounds/Explosions/Explode1.wav
4545
AddSample = ContentFile
4646
Path = Base.rte/Sounds/Explosions/Explode2.wav
47+
AddSample = ContentFile
48+
Path = Base.rte/Sounds/Explosions/Explode3.wav
4749
StanceOffset = Vector
4850
X = -12
4951
Y = -5

‎Base.rte/GUIs/Skins/Base/checkbox.bmp

1.74 KB
Binary file not shown.

‎Base.rte/LoadoutsP1.ini

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,9 @@
1-
///////////////////////////////////////////////////////////////////////
2-
// Loadouts
31

4-
/*
52
AddLoadout = Loadout
63
DeliveryCraft = ACRocket
7-
PresetName = Base.rte/Rocket MK1
4+
PresetName = Base.rte/Drop Crate
85
AddCargoItem = AHuman
9-
PresetName =
10-
AddCargoItem = ACrab
11-
PresetName =
6+
PresetName = Coalition.rte/Soldier Light
127
AddCargoItem = HDFirearm
13-
PresetName =
14-
AddCargoItem = TDExplosive
15-
PresetName =
8+
PresetName = Dummy.rte/Destroyer Cannon
169

17-
18-
AddLoadout = Loadout
19-
DeliveryCraft = ACDropShip
20-
PresetName = Base.rte/Dropship MK1
21-
AddCargoItem = AHuman
22-
PresetName =
23-
AddCargoItem = ACrab
24-
PresetName =
25-
AddCargoItem = HDFirearm
26-
PresetName =
27-
AddCargoItem = TDExplosive
28-
PresetName =
29-
*/

‎Base.rte/Sounds/Explosions/CrashRubble.wav

176 KB
Binary file not shown.

‎Base.rte/Sounds/Explosions/CrashWoosh1.wav

24.5 KB
Binary file not shown.

‎Base.rte/Sounds/Explosions/CrashWoosh2.wav

29.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)