Skip to content

Commit 0a9ac8e

Browse files
MaximDudeMaximDude
committed
Merge branch 'development' into Pause-Screen
2 parents 0fb4165 + 8c59a63 commit 0a9ac8e

File tree

98 files changed

+3011
-853
lines changed

Some content is hidden

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

98 files changed

+3011
-853
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Mods/
5959
Userdata/
6060

6161
allegro.log
62-
AbortScreen.bmp
62+
AbortScreen.*
6363
AbortLog.txt
6464
MemCleanupInfo.txt
6565
LogPublish.txt

‎Data/Base.rte/Activities/WaveDefense.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ end
9494

9595
function WaveDefense:StartNewGame()
9696
self:SetTeamFunds(self:GetStartingGold(), self.playerTeam);
97-
self:CheckBrains();
9897

9998
self.triggerWaveInit = true;
10099
self.wave = 1;
@@ -105,8 +104,10 @@ function WaveDefense:StartNewGame()
105104
if actor.ClassName == "AHuman" or actor.ClassName == "ACrab" then
106105
actor.AIMode = Actor.AIMODE_SENTRY;
107106
end
108-
actor.Team = self.playerTeam;
107+
MovableMan:ChangeActorTeam(actor, self.playerTeam);
109108
end
109+
110+
self:CheckBrains();
110111
end
111112

112113
function WaveDefense:ResumeLoadedGame()

‎Data/Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,9 @@ AddAmmo = Magazine
107107
AtomGroup = AtomGroup
108108
AutoGenerate = 1
109109
Material = Material
110-
CopyOf = Bullet Metal
110+
CopyOf = Bullet Casing
111111
Resolution = 2
112112
Depth = 0
113-
DeepGroup = AtomGroup
114-
AutoGenerate = 1
115-
Material = Material
116-
CopyOf = Bullet Metal
117-
Resolution = 3
118-
Depth = 1
119113
DeepCheck = 0
120114
JointStrength = 200
121115
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/Constructor/Constructor.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,9 @@ AddAmmo = Magazine
307307
AtomGroup = AtomGroup
308308
AutoGenerate = 1
309309
Material = Material
310-
CopyOf = Bullet Metal
310+
CopyOf = Bullet Casing
311311
Resolution = 2
312312
Depth = 0
313-
DeepGroup = AtomGroup
314-
AutoGenerate = 1
315-
Material = Material
316-
CopyOf = Bullet Metal
317-
Resolution = 3
318-
Depth = 1
319313
DeepCheck = 0
320314
JointStrength = 200
321315
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/Digger/Digger.ini

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,9 @@ AddAmmo = Magazine
201201
AtomGroup = AtomGroup
202202
AutoGenerate = 1
203203
Material = Material
204-
CopyOf = Bullet Metal
204+
CopyOf = Bullet Casing
205205
Resolution = 2
206206
Depth = 0
207-
DeepGroup = AtomGroup
208-
AutoGenerate = 1
209-
Material = Material
210-
CopyOf = Bullet Metal
211-
Resolution = 3
212-
Depth = 1
213207
DeepCheck = 0
214208
JointStrength = 200
215209
JointStiffness = 1
@@ -244,15 +238,9 @@ AddAmmo = Magazine
244238
AtomGroup = AtomGroup
245239
AutoGenerate = 1
246240
Material = Material
247-
CopyOf = Bullet Metal
241+
CopyOf = Bullet Casing
248242
Resolution = 2
249243
Depth = 0
250-
DeepGroup = AtomGroup
251-
AutoGenerate = 1
252-
Material = Material
253-
CopyOf = Bullet Metal
254-
Resolution = 3
255-
Depth = 1
256244
DeepCheck = 0
257245
JointStrength = 200
258246
JointStiffness = 1
@@ -287,15 +275,9 @@ AddAmmo = Magazine
287275
AtomGroup = AtomGroup
288276
AutoGenerate = 1
289277
Material = Material
290-
CopyOf = Bullet Metal
278+
CopyOf = Bullet Casing
291279
Resolution = 2
292280
Depth = 0
293-
DeepGroup = AtomGroup
294-
AutoGenerate = 1
295-
Material = Material
296-
CopyOf = Bullet Metal
297-
Resolution = 3
298-
Depth = 1
299281
DeepCheck = 0
300282
JointStrength = 200
301283
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,9 @@ AddAmmo = Magazine
138138
AtomGroup = AtomGroup
139139
AutoGenerate = 1
140140
Material = Material
141-
CopyOf = Bullet Metal
141+
CopyOf = Military Stuff
142142
Resolution = 2
143143
Depth = 0
144-
DeepGroup = AtomGroup
145-
AutoGenerate = 1
146-
Material = Material
147-
CopyOf = Bullet Metal
148-
Resolution = 3
149-
Depth = 1
150144
DeepCheck = 0
151145
JointStrength = 200
152146
JointStiffness = 1

‎Data/Base.rte/Devices/Tools/Repeller/Repeller.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,9 @@ AddAmmo = Magazine
5050
AtomGroup = AtomGroup
5151
AutoGenerate = 1
5252
Material = Material
53-
CopyOf = Bullet Metal
53+
CopyOf = Bullet Casing
5454
Resolution = 2
5555
Depth = 0
56-
DeepGroup = AtomGroup
57-
AutoGenerate = 1
58-
Material = Material
59-
CopyOf = Bullet Metal
60-
Resolution = 3
61-
Depth = 1
6256
DeepCheck = 0
6357
JointStrength = 200
6458
JointStiffness = 1

‎Data/Base.rte/Devices/Weapons/OldStock/BattleRifle/BattleRifle.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@ AddAmmo = Magazine
2121
AtomGroup = AtomGroup
2222
AutoGenerate = 1
2323
Material = Material
24-
CopyOf = Bullet Metal
24+
CopyOf = Bullet Casing
2525
Resolution = 2
2626
Depth = 0
27-
DeepGroup = AtomGroup
28-
AutoGenerate = 1
29-
Material = Material
30-
CopyOf = Bullet Metal
31-
Resolution = 3
32-
Depth = 1
3327
DeepCheck = 0
3428
JointStrength = 200
3529
JointStiffness = 1

‎Data/Base.rte/Devices/Weapons/OldStock/BlasterPistol/BlasterPistol.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ AddAmmo = Magazine
6969
AtomGroup = AtomGroup
7070
AutoGenerate = 1
7171
Material = Material
72-
CopyOf = Military Stuff
72+
CopyOf = Bullet Casing
7373
Resolution = 2
7474
Depth = 0
7575
DeepCheck = 0

‎Data/Base.rte/Devices/Weapons/OldStock/Pistol/Pistol.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@ AddAmmo = Magazine
2121
AtomGroup = AtomGroup
2222
AutoGenerate = 1
2323
Material = Material
24-
CopyOf = Military Stuff
24+
CopyOf = Bullet Casing
2525
Resolution = 2
2626
Depth = 0
27-
DeepGroup = AtomGroup
28-
AutoGenerate = 1
29-
Material = Material
30-
CopyOf = Military Stuff
31-
Resolution = 3
32-
Depth = 1
3327
DeepCheck = 0
3428
JointStrength = 200
3529
JointStiffness = 1

0 commit comments

Comments
 (0)