Commit Graph

20753 Commits

Author SHA1 Message Date
Oliver Brakmann
35dfb54459 Fix trait lookup of destroyed actor in SpawnActorOnDeath
The sequence of events leading to that crash looks like this:

1. Truk enters a building.

2. `Enter.FindAndTransitionToNextState()` is running, and since `DonateSupplies` uses `EnterBehaviour.Dispose`, `Actor.Dispose()` runs for the actor, queueing a FrameEndTask.

3. Truk is then killed:

 * `Health.InflictDamage()` first calls `SpawnActorOnDeath.Killed()`, which queues a FrameEndTask during which some trait lookups happen.

 * `Health.InflightDamage()` then calls `Actor.Dispose()` as well, queueing another FrameEndTask (which will never run, the game crashes before).

4. After the tick, the first FrameEndTask disposes of the actor. The second FrameEndTask would spawn the crate from the truk, but the trait lookups then fail and throw an exception.
2016-05-07 14:21:41 +02:00
Oliver Brakmann
4f206eb1dc Merge pull request #11227 from HenrytheSlav/upstream/utility-facing-fix
Fixes Utility import facings mirror-flip
2016-05-06 23:42:40 +02:00
HenrytheSlav
1962ea3abc Fixes Utility import facings mirror-flip 2016-05-05 18:44:23 +02:00
abcdefg30
f80449be31 Merge pull request #11215 from obrakmann/mod-campaign-rules
Extract common campaign rules for d2k and ra
2016-05-05 15:53:21 +02:00
Oliver Brakmann
3cdbb1f700 Make use of common mission rules in missions (D2K) 2016-05-05 13:02:08 +02:00
Oliver Brakmann
32b063d8e0 Extract common mission rules into a separate file (D2K) 2016-05-05 13:02:08 +02:00
Oliver Brakmann
4787bc04b3 Make use of common mission rules in missions (RA) 2016-05-05 13:02:08 +02:00
Oliver Brakmann
26571e18d3 Extract common mission rules into separate files (RA) 2016-05-05 13:02:03 +02:00
abcdefg30
089c8261ad Merge pull request #11217 from obrakmann/fix-selfheal-percentage
Fix self-healing percentage in yaml rules for all mods
2016-05-05 12:47:19 +02:00
Oliver Brakmann
987da71c1d Merge pull request #11222 from HenrytheSlav/theli_gems
Allow Chinook to land/deploy on gems
2016-05-05 12:21:34 +02:00
HenrytheSlav
b958c8302d Allow Chinook to land/deploy on gems 2016-05-04 23:06:36 +02:00
Matthias Mailänder
1bc4200128 Merge pull request #11136 from SzabKel/musicButtons
Added music controlling hotkeys. Closes #3231
2016-05-03 07:16:05 +02:00
Matthias Mailänder
891c5d9937 Merge pull request #11168 from reaperrr/hitshape-offsets
Add support for custom vertical HitShape offsets
2016-05-03 07:12:49 +02:00
Matthias Mailänder
b00e9cf615 Merge pull request #11216 from abcdefg30/supportBeacon
Make the circle and arrow sequences of Beacon optional
2016-05-02 22:27:12 +02:00
Oliver Brakmann
a8e6ca14ab Fix self-healing percentage in yaml rules for all mods 2016-05-02 19:05:48 +02:00
abcdefg30
c3c29ee7a2 Make the circle and arrow sequences of Beacon optional 2016-05-02 17:23:17 +02:00
Oliver Brakmann
e781bf3e0d Merge pull request #10918 from Mailaender/lint-beacon
Added documentation and lint checks to PlaceBeacon
2016-05-01 13:55:04 +02:00
Matthias Mailänder
6a9b8e81f4 Don't expose palettes and sprites to Lua. 2016-05-01 12:29:39 +02:00
Matthias Mailänder
4e9a48d253 Summarize the rendering parts to generate a beacon. 2016-05-01 12:29:39 +02:00
Matthias Mailänder
a8dd67a231 ParatroopersPower also supports beacons. 2016-05-01 12:29:38 +02:00
Matthias Mailänder
59fbfbc851 Don't enforce beacons to be player palettes. 2016-05-01 12:29:38 +02:00
Matthias Mailänder
9f4cdb9843 Unhardcode player beacons for documentation and lint testing. 2016-05-01 12:27:02 +02:00
Matthias Mailänder
76124b7c79 Unhardcode beacon sprites for documentation and lint testing. 2016-05-01 12:21:13 +02:00
Oliver Brakmann
cc9f84f136 Merge pull request #11199 from reaperrr/fix-para-nre
Fix potential NRE in Parachutable
2016-04-30 13:53:04 +02:00
abcdefg30
a9ec325765 Merge pull request #11202 from GraionDilach/fix-ts-visceroids
Fix visceroids not spawning in TS.
2016-04-30 11:53:46 +02:00
Zimmermann Gyula
48d5164314 Fix visceroids not spawning in TS. 2016-04-29 19:37:32 +02:00
reaperrr
58ba25cc17 Merge pull request #10813 from Mailaender/vein-damage
Added damaging through Veins.
2016-04-29 13:28:58 +02:00
reaperrr
262cf087fc Merge pull request #11172 from pchote/cargo-turret
Fix a crash when multi-turreted units leave a transport.
2016-04-29 12:57:04 +02:00
reaperrr
b87b2c010f Fix potential NRE in Parachutable 2016-04-29 12:56:05 +02:00
Paul Chote
21989acd28 Fix a crash when multi-turreted units leave a transport. 2016-04-29 04:05:33 +01:00
reaperrr
fdbe3c7ba6 Merge pull request #11196 from GraionDilach/halven-destroyer-closeenough
Halven CloseEnough on Stinger.
2016-04-28 14:11:45 +02:00
Zimmermann Gyula
66d0c72968 Increase Stinger RangeLimit from 50 to 65.
With the 170 Speed, the Stinger can pass a maximum of 50*170 = 8500 (8c308) world units, while having a range of 9c0, which mean it runs out of fuel before it reaches it's effective maximum range. To prevent this, RangeLimit has been increased to 65 (9c0*1.25/170 is 67.8, rounded downwards).
2016-04-27 21:51:48 +02:00
Oliver Brakmann
b28caf6564 Merge pull request #11179 from reaperrr/minor-perf-fixes
Minor trait caching tweaks
2016-04-27 20:38:02 +02:00
Zimmermann Gyula
af36214e41 Halven CloseEnough on Stinger.
With 170 Speed, 298 CloseEnough, and 128 Spread, it will always act as a proximity weapon against the targets. Other missiles aren't affected because all the other missiles have a fair margin to satisfy the optimal Speed+Spread > CloseEnough condition.
2016-04-27 18:29:50 +02:00
Oliver Brakmann
ee82a8c3a9 Merge pull request #10756 from Mailaender/ts-beacon
Added the Tiberian Sun beacon
2016-04-26 21:28:22 +02:00
Oliver Brakmann
0ba288d66b Merge pull request #11182 from Mailaender/modchooser-button-loadsound-fail
Fixed mod chooser spamming sound.log with file not found messages
2016-04-26 21:11:41 +02:00
Matthias Mailänder
92e9cf2819 Add the Tiberian Sun beacon animation. 2016-04-24 23:28:29 +02:00
reaperrr
a268b5a048 TEST COMMIT
Gives TS infantry and walls hit shapes vertical top offset.
2016-04-24 20:47:57 +02:00
reaperrr
72c580b708 Add top and bottom offsets to HitShapes 2016-04-24 20:47:56 +02:00
Matthias Mailänder
083dd97611 Don't reference non-existing sounds in the mod chooser. 2016-04-24 20:42:46 +02:00
reaperrr
c6b09ef228 Cache ResourceLayer in PoisonedByTiberium ctor
Instead of every few ticks.
2016-04-24 20:14:37 +02:00
reaperrr
828dc61b67 Use already cached mobile in MobileProperties.Scatter 2016-04-24 20:12:51 +02:00
reaperrr
b497869993 Cache IMove in Repairable's ctor
Instead of looking it up on every repair order.
2016-04-24 20:12:49 +02:00
Oliver Brakmann
23e5889a70 Merge pull request #11167 from pchote/fix-gps-satellite-palette
Fix GPS satellite palette.
2016-04-24 13:17:26 +02:00
Oliver Brakmann
d88f8d348b Merge pull request #11174 from reaperrr/fix-11173
Disable OwnerRow on TD and RA map props
2016-04-24 12:59:27 +02:00
Paul Chote
b245e6e128 Merge pull request #11163 from reaperrr/fix-11056
Fix Creeps not considering players as enemies on some TD maps
2016-04-24 11:51:49 +01:00
reaperrr
83631f3b4d Disable OwnerRow on RA trees, rocks, bridges and crates 2016-04-24 01:10:32 +02:00
reaperrr
1f078cc364 Disable OwnerRow on TD bridges, destroyed fields and crates 2016-04-24 01:07:36 +02:00
reaperrr
6701420851 Disabled OwnerRow on TD trees, tib trees and rocks 2016-04-24 00:55:04 +02:00
reaperrr
b25f8ff4b0 Fixed owner of some trees on Lessons from Kosovo and Treasure Island
They're owned by Neutral instead of Creeps now.
2016-04-24 00:54:36 +02:00