77567 Commits

Author SHA1 Message Date
Pentarctagon
d61fba680d
Github Actions caching. [ci skip] 2020-11-20 14:02:20 -06:00
Pentarctagon
c5bf66659b
Github Actions fix unit tests. [ci skip] 2020-11-20 13:23:33 -06:00
Pentarctagon
7a90b3a134
Github Actions run unit tests. [ci skip] 2020-11-20 12:47:16 -06:00
Pentarctagon
7d9d3357cf
Checkout submodules. [ci skip] 2020-11-20 12:06:12 -06:00
Pentarctagon
eb361bdccd
Use correct sanitize value.
[ci skip]
2020-11-20 11:25:54 -06:00
Pentarctagon
c09e95a20e
Github Actions ubuntu compile test. 2020-11-20 11:19:27 -06:00
Pentarctagon
ef20fc769c
Github Actions docker test. 2020-11-20 11:09:26 -06:00
Pentarctagon
3e9e33def5
Github Actions Test 1. 2020-11-20 10:49:44 -06:00
Pentarctagon
90f3255f08
Limit travis jobs to one per OS.
With the removal of Travis' OSS tier, we now have a limited amount of build time left that needs to last as long as possible.
2020-11-20 10:24:25 -06:00
Steve Cotton
b63b8a959a Convert the editor_action framework to use std::unique_ptr instead of raw pointers
When returning std::unique_ptr instead of raw pointers, the return type can't
be a co-variant, which is why the clone() functions are all being changed to
return the base class.

All of the instances of editor_action_ptr were replaced, except those in
commented-out code. Many of these replacements were with the `auto` keyword;
for the others the reason that I didn't use editor_action_ptr was that I find
`std::unique_ptr<editor_action>` quicker to read than remembering if
editor_action_ptr is a unique_ptr, a shared_ptr or a plain raw pointer.

A large amount of commented-out code in mouse_action_item.cpp and
mouse_action_unit.cpp gets removed, but the commented-out code in
action_item.cpp is left for a future refactor. I think the classes in these
files should end up being refactored with the responsibilty for putting items
on the map moving from mouse_action_item.cpp to action_item.cpp, leaving only
the parts specific to the input method in mouse_action_item.cpp. However,
that's for a separate commit (and separate PR).
2020-11-20 11:51:08 +01:00
josteph
205f779cc5 Addon manager: Save the last sort order in a hidden preference
This uses MAKE_ENUM for the listbox sort order, so that it can
be serialized to the preferences file.
2020-11-20 06:28:22 +01:00
Pentarctagon
b050a13b5d
Changelog update. 2020-11-19 22:35:51 -06:00
Hejnewar
2a1a385478
Balance update (#5289)
Dune Rider xp changed from 42 to 47.
Sunderer line dodge on hills changed form 60% to 50%.
Scorcher gold cost changed from 23 to 25.
Dragoon gold cost changed from 27 to 28.
Elvish Rider gold cost changed form 32 to 28.
2020-11-19 22:33:00 -06:00
nemaara
3d1a44847c DiD S9: another attempt at fixing ghost recall bug 2020-11-19 16:34:58 -05:00
Severin Glöckner
4e5fa1ad3b TSG Into the Depths: reposition portrait
Grek and his units are on the left corner of the screen,
the same place where the portrait is overlayed.
Better using the right side for Grek's portrait.
2020-11-19 22:17:49 +01:00
Severin Glöckner
baa889c4e9 TSG Into the Depths: Fix Troll villages
… not being transferred

Fixes #5269
2020-11-19 22:02:17 +01:00
Iris Morelle
6fe9e3040e Fix C/C++ indentation size
The previous setting is horribly inconsistent with existing practice in
this project, as well as the clang-format tool configuration included.

[ci skip]
2020-11-19 16:49:32 -03:00
loonycyborg
d643edc907 Silence -Wstringop-overflow warning from lua codebase
It currently results in some false positives from gcc 10.
2020-11-19 21:02:30 +03:00
Charles Dang
159609b58b Fixed some uninitialized members 2020-11-20 04:36:04 +11:00
loonycyborg
a15732aac3 Fix debug build on mingw platform 2020-11-19 19:45:06 +03:00
Steve Cotton
ffeb80f6ca Add a unit test for the behavior of [unit]id= recalling units
Answers a question raised in PR #4999. This also passes on 1.14.
2020-11-19 16:07:47 +01:00
Elvish_Hunter
30d9697ab5 wmlindent run on macros/deprecated-utils.cfg 2020-11-19 12:53:29 +01:00
Elvish_Hunter
4cf440e729 wmlscope: remove 'endarg' strings from HTML output 2020-11-19 11:49:39 +01:00
Elvish_Hunter
b39ca0e548 wmlscope: report optional macro arguments in HTML output 2020-11-19 11:46:55 +01:00
Elvish_Hunter
8c3ca97287 wmlscope: also report macros without documentation in HTML output 2020-11-19 11:44:52 +01:00
Elvish_Hunter
044901fd01 Fixed a deprecation comment to match a regex used in wmlscope 2020-11-19 11:37:06 +01:00
Elvish_Hunter
d51d389801 wmlscope: report about deprecated macros in HTML reference 2020-11-19 11:35:04 +01:00
Steve Cotton
296046d211 SotA: Don't concatenate strings in the recruit dialog
Instead of trying to concatenate translatable strings, just make a single full
string to be shown in the recruitment dialog. This came from trying to update
the i18n hints, and realising my suggest of making the swimmers "Merfolk" in
f6dc83375 was causing problems when they could also be nagas.

These strings are stored in a variable at the start of the campaign (in
ZOMBIE_INIT), so won't appear when loading an existing save game. This is why
the Lua script keeps some support for the old names (although they're not going
to be translated in that case).
2020-11-19 07:47:58 +01:00
nemaara
013bea067f DiD S6: fix orc reinforcement side 2020-11-18 17:41:16 -05:00
nemaara
03ea33ff02 DiD S5: increase AI aggression 2020-11-18 17:36:58 -05:00
nemaara
0c11cf40ea DiD S4: fix bad unit filter 2020-11-18 17:36:44 -05:00
Iris Morelle
74e838865c Update changelog 2020-11-18 18:17:59 -03:00
Artem Khrapov
4ca02ba8a4
Fixed the emptiness check for the addon's meta 2020-11-18 23:46:33 +03:00
kabachuha
00df26e116 update changelog
[ci skip]
2020-11-18 21:20:34 +03:00
kabachuha
2a2a2e84e8 Moved the downgradable status tracking to the UI 2020-11-18 20:49:49 +03:00
Artem Khrapov
967504aba5
Allow downgrading of existing addons 2020-11-18 19:33:54 +03:00
Iris Morelle
1f2eb4b4b2 desktop: Fix multiple compiler warnings
* Uninitialized struct members
 * switch case fallthrough (intended)
2020-11-17 21:41:14 -03:00
Iris Morelle
cc087491f1 campaignd: Drop redundant includes 2020-11-17 20:07:18 -03:00
Iris Morelle
7d02fc884b campaignd: Don't bump download count when a delta is requested
This is a bit redundant but if you want a partial download then you are
most certainly updating something that already exists on your end, so
no, you don't get to bump the download count that way even you leave out
increase_downloads= somehow.
2020-11-17 19:54:29 -03:00
Iris Morelle
ca4ee0356c campaignd: More code clean-up 2020-11-17 19:53:27 -03:00
Iris Morelle
fbf472f1b4 campaignd: Implement client-specified update target in [request_campaign]
The previous implementation here didn't actually use the from/to version
bounds when building the delta pack sequence. So... let's fix that so
people aren't forced to receive a bogus delta that invariably contains
the changes from the earliest uploaded version to the latest.
2020-11-17 19:48:35 -03:00
Iris Morelle
352cbc32ec campaignd: Refactor [request_campaign]
This makes the code easier to follow, hopefully, and quite importantly
avoids an unnecessary copy while building the update pack sequence.

It does away with the size report for deltas in stderr because it's
inaccurate by design -- it's the sum of the individual packs' compressed
sizes rather than the size of the compressed result (which we cannot
determine in advance.)

While testing this I ran into an issue where apparently someone didn't
implement the from/to version logic for the update pack sequence, who
knew. Gotta fix that later I reckon.
2020-11-17 19:48:35 -03:00
Iris Morelle
2018990b62 campaignd: Some code clean-up 2020-11-17 19:48:35 -03:00
Lukas Jox
d30b3eccb8 update changelog 2020-11-17 14:56:26 -06:00
Lukas Jox
a8f057d5be SoF S4: prevent resource spawn on strange locations; fixes #5278 2020-11-17 14:56:26 -06:00
Lukas Jox
9f6cca84c4 Revert "SoF S4: prevent resource spawn on castles"
This reverts commit 7e00c45e665d9572eeaaa025c052594cf9dd05ed.
2020-11-17 14:56:26 -06:00
Lukas Jox
bff72310ad SoF S2p5: change event to follow player expectations 2020-11-17 14:56:26 -06:00
Steve Cotton
1cd0cc7d26 SotA: Fix Ardonna's zombie list after Rastabahn's scenarios
Fixes #5256, which was that `{SAVE_ZOMBIE_LIST rastabahn_zombies}` overwrote
the ardonna_zombies variable.

Move the MERGE_ZOMBIE_LIST code to be next to the LOAD and SAVE code, as any
change to one of these functions should probably be done to all of them.
2020-11-16 04:54:08 +01:00
Steve Cotton
99f27b7191 Make saved_game::expand_scenario() look correct, and add a const
This doesn't change the behavior - the changed line is in a conditional block
which tells us exactly which of scenario_id()'s code paths will happen, and it
will still end up using carryover_["next_scenario"]. The change is just making
it consistent with the way that other lines in expand_scenario() find out which
scenario id to use; it's preparing to load the next scenario, so it should use
that scenario's id to load any metadata, not the current scenario's id.

Also, scenario_id() should be const. This helps with refactoring out the
existence of a de-facto singleton instance of saved_game.
2020-11-16 04:52:24 +01:00
doofus-01
c4bb3c62b0
Update changelog.md 2020-11-14 21:05:49 -08:00