1
1
forked from 0ad/0ad
Commit Graph

22312 Commits

Author SHA1 Message Date
Angen
6400a4a0c5 Update Available mods when installing them
Differential revision: D4211
Since 498f0d420b available mods where cached and not updated when new
where installed.
Fixing above.

This was SVN commit r25850.
2021-08-17 17:32:10 +00:00
Angen
8f5b5670ff Fix gui objects failing on undefined in modmod
Differential revision: D4209
Since some revision wraitii will probbaly know, I am not going to look
for it, guiobjects require exact data type so casting does not work when
it is not done beforehand.
Error reported by Stan.
Now installing pyromod should not trigger errors.

This was SVN commit r25849.
2021-08-17 17:29:54 +00:00
32f3d18a15 Fix walk and fight with formations.
Introduced in c87229aa48, FindWalkAndFightTargets returns after the
first UnitAI finds a target, instead of also querying the rest of the
members.

Differential revision: https://code.wildfiregames.com/D4208
Comments by: @Stan, @wraitii
Fixes: #6260

This was SVN commit r25847.
2021-08-03 16:43:43 +00:00
c48d0c562f Fix fromations gathering treasures.
Introduced in ea96e81098.
The formation ignored the order to collect a treasure, but got into a
individual state (which should not happen).
Subsequent orders may fail due to unimplemented components/functions.

Reported by: @wowgetoffyourcellphone in
https://wildfiregames.com/forum/topic/39973-a25-feedbacks-from-testing/page/15/?tab=comments#comment-444979.

Differential revision: https://code.wildfiregames.com/D4207
Tested by: @wowgetoffyourcellphone
Comments by: @Stan, @wraitii
Fixes: #6266

This was SVN commit r25846.
2021-08-03 16:42:56 +00:00
Angen
8b0d82be33 Reject FormationWalk if entity is not part of formation anymore
Attack orders can be and looks like are pushed in front of formationwalk
order.
That is generally also logic in single entity behaviour.

In case formation gets destroyed and then target dies, attacker is
supposed to stop attacking target immediately.
That essentially leads to getting to old formationwalk command, what was
not issue for packable units until 674cdae166, that introduced
formationcompoennt into the order.

Hovewer abandoning this order without being in formation makes more
sense. Probably this one and FormationLeave should be FORMATIONMEMBER
specific commands and error out in INDIVIDUAL state, but thats too much
refactoring and potential rabbit hole.

Differential revision: D4206
Reviewed by: @wraitii
Accepted by: @asterix
Fixes: #6263

This was SVN commit r25845.
2021-08-02 16:48:00 +00:00
0ba9cbef74 Fix units changing appearance when switching animation.
Bug introduced in 76acc4e146.
The previous CUnit code had logic to select random aesthetic variants
once initially. The new code removed that, as I completely missed its
purpose, assuming that the random selection, being based on a seed,
would pick the same variants every time. This is incorrect because
entity selections can change the RNG calls, thus the variants, and thus
entity appearance can change when the animation changes (typically, a
horse will change color when walking and running).

The solution is to re-introduce the choice of actor selections on CUnit
creation. This makes sure that units don't change their purely-aesthetic
selections when e.g. animations change.

Reported by: Wowgetoffyourcellphone
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4205
This was SVN commit r25844.
2021-07-31 17:55:10 +00:00
12aa35eb3b Fix loading grayscale heightmaps for RM maps.
d2948937a0 introduced code to read Heightmap images into RM terrain
data. However, the original diff contained a bug where it read
Out-of-bounds array data for grayscale images. This bug was hidden by
another issue until D1816 / cbc04ba83b, which changed the code and made
the OOB read actually relevant. The effect was twofold:
- The height chosen was not the max of the 3 color channels, but the max
of the 3 neighboring pixel (thus slightly lowering the quality of
generated maps)
- The height for the bottom-right coordinates were random memory values,
thus garbage.

This random height ended up resulting in non-deterministic map
generation, which was reported on Ngorongoro.

The cause of this silent failure is that the transformation to BGRA is
not applied for grayscale images, as the alpha transformation is
processed first and exits. This is not per-se buggy, so it is not
changed here.
The fixed behaviour is specialized for the common grayscale case, and
retains the max-of-3-color-channel intended behaviour otherwise.

Fixes #6261.

Reported by: Feldfeld
Differential Revision: https://code.wildfiregames.com/D4203
This was SVN commit r25843.
2021-07-31 17:52:05 +00:00
Angen
ae744f13f3 Prevent formation members to run when they should not
Reported on forum:
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/13/
Introduced in: 40cbde1925
Differential revision: D4201
Tested by: @Freagarach, @marder
This was SVN commit r25841.
2021-07-27 18:20:26 +00:00
cba3528c48 Update translation credits.
- Restore original language names, and keep an English fallback in case
the font is missing for some languages.
Fixes: #6023
Fixes: #6255

This was SVN commit r25839.
2021-07-26 16:40:16 +00:00
d3e1184191 Check range extra while gathering to prevent animation changes when gathering from dropsite.
Introduced in 3c4a341906.

Reported by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4198
This was SVN commit r25837.
2021-07-25 18:14:39 +00:00
5fba65e97d Don't lose trade gain when ordering a trader.
Introduced in 8f04d2ee90 due to overeagerly stopping trade when leaving
the trading-state.
Noticed in:
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/9/?tab=comments#comment-437888.

Differential revision: https://code.wildfiregames.com/D4197
Comment by: @Stan
This was SVN commit r25835.
2021-07-23 05:24:41 +00:00
c7a6d49fc8 Translate map name in game setup
Patch by: @s0600204
Tested by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4188
Fixes: #6241

This was SVN commit r25833.
2021-07-20 22:08:36 +00:00
2bda444435 Fix foundation and corpses phenotypes being different than the source entity.
Reported by: @wowgetoffyourcellphone
This was SVN commit r25832.
2021-07-20 22:04:19 +00:00
c6a9e7188e Fix actor being different after foundation has been built.
Reported by: @wowgetoffyourcellphone
Introduced in: 5b3bdf3647

This was SVN commit r25831.
2021-07-20 21:51:29 +00:00
72a20be1df Fix rare crash on Linux when opening dropdowns.
Patch by: @wraitii
Accepted by: @Angen
Fixes #5598
Fixes #6225

Differential Revision: https://code.wildfiregames.com/D4183
This was SVN commit r25830.
2021-07-20 20:59:45 +00:00
5eec8039b4 Fix segfault with daytime option in gamesetup.
Based on patch by: @Angen, @wraitii
Fixes #6238
Differential Revision: https://code.wildfiregames.com/D4182
This was SVN commit r25829.
2021-07-20 20:52:25 +00:00
b06dd26dd7 Fix PetraAI constructing ships as ordinary units.
Since 3d7af82328 PetraAI constructed many ships (and cavalry) because
they have the "Ranged" class and we didn't check for "Infantry" anymore
when training workers.

Basically a patch by: @Angen
Differential revision: https://code.wildfiregames.com/D4193
Reviewed by: @Angen
Refs. #6250 by fixing the ships case.
Fixes the concern on 3d7af82328.

This was SVN commit r25828.
2021-07-20 05:18:50 +00:00
fe6ce8d402 (Partly) Fix PetraAI building a lot of siege and not using it.
Following 3d7af82328.
The used classes for adding siege were wrong.

Reported in
https://wildfiregames.com/forum/topic/45178-a25-svn-version-25810-not-playable/.
Differential revision: https://code.wildfiregames.com/D4184
Refs. #6250 by (partly) fixing the siege case.
Reviewed by: @Angen
This was SVN commit r25826.
2021-07-18 05:05:13 +00:00
Angen
f891ed4e53 Fix treasure in statistics
Introduced in ea96e81098.
Wrong entity is passed when getting statistic tracker, so collected
treasure is not updated correctly in statistics.
Reported on forum:
https://wildfiregames.com/forum/topic/47585-a25-svn-treasures-collected-not-registering-under-resources-summary-playing-atlas-mountains/?tab=comments#comment-441383

This was SVN commit r25824.
2021-07-13 16:46:32 +00:00
68e40575a4 Disable autoqueue when changing ownership.
PetraAI can't cope with that and it may be a suprise for other players
as well, when a captures production entity has autoqueue enabled.

Differential revision: https://code.wildfiregames.com/D4185
Refs: #6213

This was SVN commit r25819.
2021-07-05 06:18:26 +00:00
4c2d060d73 Move wild lake biome specific entities to a json file like hellas.
Fix map not generating with nubia and steppe biomes (Missing farmsteads
and mercenaries)
Fix an oak being placed no matter the biome and use a biome tree instead
Use the goat instead of a sheep for the alpine biome.

Refs: 4de9c4c164, #6180

This was SVN commit r25816.
2021-06-29 16:48:57 +00:00
dddaa67abd Fix unicode build for Atlas on OpenSuse.
Based on a patch by: @MatSharrow
Reviewed by: @wraitii
Differential Revision: https://code.wildfiregames.com/D4178
This was SVN commit r25815.
2021-06-29 12:41:31 +00:00
7871d74521 Give picking up treasures back its sound.
Introduced in ea96e81098.

Reported by: Gurken Khan in
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/?do=findComment&comment=437100.
Differential revision: https://code.wildfiregames.com/D4180
Tested by: @Langbart
Fixes: #6237

This was SVN commit r25814.
2021-06-29 09:04:24 +00:00
42c3fc12cf Don't show turreted entities as idle.
Introduced in: 21e866fcf0

Reported by: @Palaiologos
Differential revision: https://code.wildfiregames.com/D4179
Tested by: @Langbart
Comments by: @Angen, @wraitii
Fixes: #6233

This was SVN commit r25813.
2021-06-29 08:51:21 +00:00
79fb6e6ab2 Fix incorrect comment/default parameter introduced in e1a0cabf5a
Reported by: Freagarach
Differential Revision: https://code.wildfiregames.com/D4176
This was SVN commit r25811.
2021-06-26 09:09:04 +00:00
a541f3a317 Fix hotloading making models disappear.
The actors were always hotloaded because of a bad logic change in
76acc4e146.

Fixes #6228

Differential Revision: https://code.wildfiregames.com/D4175
This was SVN commit r25805.
2021-06-17 07:52:50 +00:00
8c7d77a610 Fix serialisation crash when patrolling.
6778fc4ea6 introduced waiting at the patrol points, but it was possible
that at such a point an enemy was noticed, thus quiting the "look
around" state, deleting `this.stopSurveying`, which was later `++`-ed.
That lead to an `NaN` property which got serialised. `NaN` serialisation
crashes as of 0e7fafebe1.

Differential revision: https://code.wildfiregames.com/D4177
Reported in:
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/4/?tab=comments#comment-435709
Reviewed by: @wraitii
This was SVN commit r25804.
2021-06-17 07:40:24 +00:00
17c54d5a69 Fix options occasionally thinking they've been modified when they haven't.
std::array leave the values in an undefined state which can very well be
'true'.

Tested By: Freagarach
Fixes #6205

Differential Revision: https://code.wildfiregames.com/D4170
This was SVN commit r25802.
2021-06-16 15:54:55 +00:00
d8f0bde05e Reset the campaigns previews
I had used a debug image which I left in and which looks broken.
Removing it defaults to the normal 'missing preview' 0 A.D. image which
looks more correct.

Differential Revision: https://code.wildfiregames.com/D4172
This was SVN commit r25801.
2021-06-16 15:53:19 +00:00
8e26bd0446 Fix bug with map-dependent random settings
Settings like Landscape, Daytime & team placement are map dependent. If
"random" map is chosen, we first must select the map before selecting
these.
This wasn't done correctly and so starting "random" map that picked e.g.
Unknown could fail.

Biomes were already correctly handled.

Reported by: langbart
Fixes #6227

Differential Revision: https://code.wildfiregames.com/D4173
This was SVN commit r25800.
2021-06-16 15:52:19 +00:00
eafa7fc005 Mirage unrepairable in cmpRepairable.
e0800bc092 introduced a `repairable` toggle, but did not mirage that
function, meaning one could not repair an allied miraged structure.

Reported by: Langbart
Patch by: Freagarach
Refs #6226

Differential Revision: https://code.wildfiregames.com/D4171
This was SVN commit r25799.
2021-06-15 08:46:14 +00:00
6f49e7bd6b New key for signing A25-compatible mods.
This was SVN commit r25798.
2021-06-14 19:42:00 +00:00
fde057dd1c Provide Magadha description.
Text by: @wowgetoffyourcellphone
Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4169
Comment by: @marder
Fixes: #6222

This was SVN commit r25796.
2021-06-14 06:15:28 +00:00
6b493aa52c Fixes big screenshots, implements CCamera::GetViewQuad properly for custom projections.
Differential Revision: https://code.wildfiregames.com/D4165
This was SVN commit r25794.
2021-06-13 17:42:37 +00:00
08400276e1 Slight size increase for the parchment background of loading screen tips.
Prevents overflow in some translations, and aligns it better with the
tip image.

Patch by: Langbart
Fixes #4754

Differential Revision: https://code.wildfiregames.com/D4167
This was SVN commit r25793.
2021-06-13 15:12:14 +00:00
893ea3cd10 Alpha 25 Name: Yaunā
This is the old Persian variant of Ionian.

Differential Revision: https://code.wildfiregames.com/D4130
This was SVN commit r25792.
2021-06-13 15:08:27 +00:00
467f2140be Fixup 21bbeb4bbc
I momentarily forgot that `arc patch` only pretends it works with binary
files on SVN.

This was SVN commit r25791.
2021-06-13 15:07:03 +00:00
7ca15b42fd Add a tip about the default formation feature.
Differential Revision: https://code.wildfiregames.com/D4166
This was SVN commit r25790.
2021-06-13 15:02:54 +00:00
21bbeb4bbc Update some MR map previews.
Updates the map previews of all the Best for MP maps & Empire

This removes the fancy mainland biome switch because it was the only map
to do that and we lack the tools to automate it.

Differential Revision: https://code.wildfiregames.com/D4159
This was SVN commit r25789.
2021-06-13 14:56:16 +00:00
b4b7a1fc3a Fix issues with Introductory Tutorial
- Actually win at the end, thus advancing the campaign
- Count rams properly
- Show the ready button for the city-phase when cheating.

Reported by: langbart
Fixes #6188

Differential Revision: https://code.wildfiregames.com/D4161
This was SVN commit r25788.
2021-06-13 08:55:37 +00:00
9ef19ad795 Remove African Plains from "best for Mp" maps
Too similar to either Nearestern Badlands or Mainland.
It seems better to remove it from the filter for this release.

Differential Revision: https://code.wildfiregames.com/D4160
This was SVN commit r25787.
2021-06-13 08:46:12 +00:00
f189172db6 UnitMotion hack to fix units being stuck near corners.
I think there is a small mismatch between CheckMovement & the vertex
pathfinder when computing passability because one is ray-based and the
other just uses edges. However, it's out of my reach to fix it for now.
This can lead to units being stuck near building edges occasionally.
This introduces an un-intrusive recovery strategy (aka a hack) in
HandleObstructedMove that should get the units unstuck.

Should fix #6114 (to a sufficient extent anyways)

Differential Revision: https://code.wildfiregames.com/D4162
This was SVN commit r25786.
2021-06-13 08:43:32 +00:00
caebc4d3f9 Update the splash screen.
Link to the forums instead of solely the known issues. We have an FAQ
button already, and there are fewer known issues than in the past.

Remove the bit about formations, which isn't really relevant anymore,
and instead add a request for contributions.

Differential Revision: https://code.wildfiregames.com/D4156
This was SVN commit r25785.
2021-06-13 08:40:26 +00:00
a5399d34b8 Floor turn rates to 4
The pathfinders are not aware about turn time, and pathing becomes quite
poor with such low turn rates, leading to units that take much longer to
move than they used to.

Until the pathfinders are updated, we should refrain from using very low
turn rates on actual units.

Refs #6142

Differential Revision: https://code.wildfiregames.com/D4163
This was SVN commit r25784.
2021-06-13 08:11:48 +00:00
dd779872c4 Small tweak of map flare characteristics
Refs #3491

Differential Revision: https://code.wildfiregames.com/D4099
This was SVN commit r25783.
2021-06-12 22:35:30 +00:00
bfc20bc847 Add a background to campaign load page
Differential Revision: https://code.wildfiregames.com/D4157
This was SVN commit r25781.
2021-06-12 17:20:01 +00:00
7e423fe20e Only show the full template run name + template name if they're different.
The campaign screen currently shows both the name of the run (selected
by the user) and the name of the campaign. This is, by default, the
same, and thus looks weird.

Reported by: langbart, marder
Tested by: marder
Differential Revision: https://code.wildfiregames.com/D4158
This was SVN commit r25780.
2021-06-12 17:19:09 +00:00
956b3f96db Improvement to autoqueue usability
The graphical interface will show autoqueued units as 'ghost' units so
the player gets immediate feedback on what's happening.
The autoqueue disengages if it runs out of resources or entity limits:
this reflects that the autoqueue cannot resume on its own.

By changing the spot where the autoqueue pushes items, the autoqueue no
longer 'buffers' one unit in advance, but remains very slightly less
efficient than manual queuing. This also prevents cheats from leading to
a ton of units accidentally being created.

Accepted By: Freagarach
Refs #6213

Differential Revision: https://code.wildfiregames.com/D4144
This was SVN commit r25779.
2021-06-12 09:43:57 +00:00
42d6893eb8 Fix lobby dgame details panel with incompatible mods.
There was an issue in 07e44a75a1 that made the game details mostly red
with incompatible mods.
This fixes that: now only the 'Mods' title is red, and I added specific
text to highlight why it's colored that way.

Based on a patch by: Langbart
Differential Revision: https://code.wildfiregames.com/D4153
This was SVN commit r25778.
2021-06-12 08:57:34 +00:00
721cfa7ae6 Improve some options texts.
Differential revision: https://code.wildfiregames.com/D3741
Comments by: @Nescio, @wraitii
This was SVN commit r25777.
2021-06-12 05:56:23 +00:00