Commit Graph

20829 Commits

Author SHA1 Message Date
reaperrr
cee5ec4754 Give large D2k missiles a ballistic flight curve 2016-05-15 16:38:34 +02:00
reaperrr
2c7fe90532 Use 'true' instead of 'yes' on all D2k booleans 2016-05-15 16:38:02 +02:00
reaperrr
974eb5aa86 Fix facings of D2k grenadier stand sequence 2016-05-15 16:34:58 +02:00
Matthias Mailänder
0d500f4bb2 Merge pull request #11270 from reaperrr/fix-td-fieldcrash
Make FrozenUnderFog footprint include '_'
2016-05-15 15:40:08 +02:00
reaperrr
95a927a181 Merge pull request #11272 from r34ch/cold-front-fix
Cold front fix
2016-05-15 15:17:16 +02:00
reaperrr
e59c7a8b1f Make FrozenUnderFog count passable footprint cells
To avoid crashing on actors with only passable footprint cells.
2016-05-15 14:56:08 +02:00
Matthias Mailänder
b4cbb52d27 Merge pull request #11206 from evgeniysergeev/spatial
SpatiallyPartitioned fixup for d2
2016-05-15 14:46:53 +02:00
reaperrr
c201558023 Merge pull request #10714 from Mailaender/import-rules
Added basic RA2/TS mod rules importers
2016-05-15 14:46:24 +02:00
Matthias Mailänder
060eca8c50 Merge pull request #11288 from reaperrr/fix-reloading-sound
Play reload sounds only to owner
2016-05-15 14:20:41 +02:00
reaperrr
794db5a2f1 Play reload sounds only to owner 2016-05-15 13:53:21 +02:00
Matthias Mailänder
b9ed065328 add captureable, infantry emitting on sell and transformation 2016-05-15 11:46:46 +02:00
Matthias Mailänder
6b1dc60d2e invisible, 0x0 foundation and sprite image auto-detection 2016-05-15 11:46:46 +02:00
Matthias Mailänder
26c0f1ebc0 terrain palette auto detection 2016-05-15 11:46:46 +02:00
Matthias Mailänder
ee482fee29 very basic building and tree support 2016-05-15 11:46:46 +02:00
Matthias Mailänder
0fc73cbe3c Merge pull request #11280 from Biofreak1987/nod08a
Add nod08a
2016-05-15 09:35:18 +02:00
Biofreak1987
e9195d3a36 Add nod08a 2016-05-15 09:04:17 +02:00
abcdefg30
2865c833eb Merge pull request #11281 from Biofreak1987/nod07fix
Replace nod07 music and fix codestyle
2016-05-14 20:51:09 +02:00
Biofreak1987
53d08e9376 Replace nod07 music and fix codestyle 2016-05-14 20:08:58 +02:00
Oliver Brakmann
3e8309974a Merge pull request #11278 from reaperrr/gps-fixup
Hotfix for GpsPower
2016-05-14 17:14:31 +02:00
reaperrr
7e312bab0a Hotfix for GpsPower
Radar namespace was created after the last rebase of #11018.
2016-05-14 16:43:42 +02:00
reaperrr
b9c026d545 Merge pull request #11018 from Mailaender/gps-disable
Fixed GPS power not taking tech center disablement into account
2016-05-14 16:31:34 +02:00
Matthias Mailänder
61385fabd1 Merge pull request #11257 from HenrytheSlav/c4lockup
Buildings get locked by Demolishable activity before their destruction
2016-05-14 13:50:35 +02:00
D'Arcy Rush
0e5dd08c21 Remove erroneous ore cells from dual-cold-front.oramap 2016-05-14 12:07:24 +01:00
D'Arcy Rush
8ebd885145 Rename cold-front 1v1 to match ingame name 2016-05-14 12:04:07 +01:00
HenrytheSlav
a9bb79c0a8 Buildings get locked by Demolishable activity nefore their destruction 2016-05-14 11:23:21 +02:00
Matthias Mailänder
531570fdb7 Merge pull request #11271 from cjshmyr/slnfix
Fix nod07b Lua script paths
2016-05-14 08:43:49 +02:00
Curtis Shmyr
1144803767 Fix nod07b Lua script paths 2016-05-13 17:56:07 -06:00
reaperrr
f31ea658ef Merge pull request #11148 from pchote/improve-scroll-input
Expose separate middle and right mouse scroll config.
2016-05-13 22:44:18 +02:00
Matthias Mailänder
54c30175e2 Merge pull request #11253 from HenrytheSlav/demotruck_air_nerf
Reduce effectiveness of demo truck against air targets
Closes #10865
2016-05-13 18:59:18 +02:00
Matthias Mailänder
67d04b26fd Merge pull request #11254 from HenrytheSlav/harv_selfheal
Add slow selfealing to the harvester (RA mod)
2016-05-13 18:56:34 +02:00
Oliver Brakmann
7abe20ac43 Merge pull request #11250 from abcdefg30/byeInitAct
Remove the last relicts of InitialActivity
2016-05-11 20:57:44 +02:00
evgeniysergeev
7e7b3f505d SpatiallyPartitioned fixup for d2
BoundsToBinRowsAndCols fixup for negative width or height

Using Math.Min and Math.Max utils instead of '?:'
2016-05-10 22:39:46 +03:00
HenrytheSlav
4c97bd1323 Add slow selfealing to the harvester (RA mod) 2016-05-10 21:17:01 +02:00
HenrytheSlav
aedd135c45 Reduce effectiveness of demo truck against air targets 2016-05-10 20:52:40 +02:00
abcdefg30
304c9b9ed1 Remove the last relicts of InitialActivity 2016-05-10 18:33:57 +02:00
abcdefg30
34a2033350 Merge pull request #11249 from cjshmyr/arty
Reduce RA Artillery range from 14 to 12 cells
2016-05-10 18:11:21 +02:00
abcdefg30
22ee4d1f39 Merge pull request #11186 from Mailaender/map-import-tileset
Made the legacy map import more robust
2016-05-10 18:03:16 +02:00
Matthias Mailänder
43eed07fae Merge pull request #11245 from reaperrr/fix-gtwr-make
Skip TD guard tower make anim frames containing yellow color
2016-05-09 20:43:47 +02:00
Matthias Mailänder
15a58378cb Merge pull request #11242 from Mailaender/ts-ai
Update the Tiberian Sun AI
2016-05-09 19:59:28 +02:00
reaperrr
9b16ac6bf1 Skip TD guard tower make frames 18 and 19
Those frames are yellow but not remapable. Skipping them is easier than fixing the art.
2016-05-08 21:03:22 +02:00
Matthias Mailänder
aea521815c Update the Tiberian Sun AI. 2016-05-08 20:19:41 +02:00
reaperrr
bd2a24af55 Merge pull request #11223 from Mailaender/missile-dead
Cleaned up logically dead Missile code.
2016-05-08 14:09:27 +02:00
abcdefg30
4fbb3334bf Merge pull request #11238 from obrakmann/fix-globalchat-nre
Fix a spurious NRE in GlobalChat
2016-05-08 14:02:12 +02:00
reaperrr
eb6157f81e Merge pull request #11197 from pchote/add-sysinfo-opt-out-prompt
Add sysinfo opt out prompt
2016-05-08 13:10:55 +02:00
Oliver Brakmann
d049413c26 Fix a spurious NRE in GlobalChat 2016-05-08 12:35:50 +02:00
Matthias Mailänder
763c097498 Merge pull request #11235 from Biofreak1987/nod07b
TD Campaign: Add nod07b - "Sick And Dying (b)
2016-05-08 12:03:39 +02:00
Biofreak1987
b14080cff4 Add nod07b 2016-05-07 17:56:25 +02:00
Paul Chote
bd7e53bec4 Merge pull request #11234 from obrakmann/fix11218-spawnactorondeath-dispose-race
Fix trait lookup of destroyed actor in SpawnActorOnDeath
2016-05-07 15:58:20 +01:00
Matthias Mailänder
5462097c42 Merge pull request #11205 from reaperrr/rangelimit-wdist
Refactored Missile.RangeLimit to be a WDist value
2016-05-07 15:10:49 +02:00
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