Commit Graph

20815 Commits

Author SHA1 Message Date
Paul Chote
0a7c80ef6e Prepare short game code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
e3bc73a168 Prepare ally build adjacency code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
c412e4e86c Prepare MapCreeps code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
7e49ae7eb0 Prepare DeveloperMode code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
1eba0bea13 Prepare Shroud code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
a0b5b5ce66 Move initial map exploration to Shroud. 2016-05-14 18:54:44 +01:00
Paul Chote
dade84db85 Remove leftover dead fragile alliances code. 2016-05-14 18:54:44 +01: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
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
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
Matthias Mailänder
834295fb22 Merge pull request #11228 from pchote/appdata-about-fix
Update appdata description using text from the website About page.
2016-05-07 13:52:37 +02:00
Matthias Mailänder
11a54896c1 Merge pull request #11094 from Biofreak1987/nod07a
TD Campaign: Add nod07a - "Sick And Dying (a)"
2016-05-07 13:47:21 +02:00
Matthias Mailänder
690a6b715e Merge pull request #11233 from abcdefg30/yellow
Add TheRaffy to AUTHORS
2016-05-07 13:30:05 +02:00
abcdefg30
c92792e8bd Add TheRaffy to AUTHORS 2016-05-07 13:01:55 +02:00
Paul Chote
1180e7e519 Merge pull request #11225 from obrakmann/fix11219_oil-derrick-tooltip-owner-row
Re-instate owner row for oil pumps and tech buildings in TD
2016-05-07 10:42:30 +01:00
Paul Chote
cf4ef11403 Merge pull request #11232 from abcdefg30/navalRepair
Fix possible instant repairs by spamming Repair activities
2016-05-07 10:30:57 +01:00
reaperrr
5505595a79 Merge pull request #11226 from abcdefg30/03bTruk
Fix the supply truck in allies03b not being targetable by tanya
2016-05-07 11:01:15 +02:00
reaperrr
f2a0332f8d Merge pull request #11231 from abcdefg30/trukPreq
Fix the prerequisite of the supply truck being displayed
2016-05-07 10:47:30 +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
Oliver Brakmann
79d5498dfc Re-instate owner row for oil pumps and tech buildings in TD 2016-05-06 22:50:16 +02:00
abcdefg30
25b1c991a2 Fix possible instant repairs by spamming Repair activities
Noticeable when spam-clicking on a naval yard/sub pen.
2016-05-06 17:51:24 +02:00
abcdefg30
94fc26f268 Fix the prerequisite of the supply truck being displayed
We don't do this for other units that only require a war factory (like the light tank or ranger) either.
2016-05-06 17:09:53 +02:00
Paul Chote
122fb62a76 Update appdata description using text from the website About page. 2016-05-05 21:56:13 +01:00
HenrytheSlav
1962ea3abc Fixes Utility import facings mirror-flip 2016-05-05 18:44:23 +02:00