78402 Commits

Author SHA1 Message Date
doofus-01
d435ec3d0b campaigns - Add flood water to UtBS S8 2021-02-15 10:26:36 -08:00
Pentarctagon
7349ac65e0
lua unpack -> table.unpack
lua 5.4 apparently fully did away with the former.

Fixes #5546
2021-02-15 12:11:48 -06:00
doofus-01
625c41b93b terrain-graphics - small changes related to water transitions 2021-02-15 09:35:53 -08:00
Charles Dang
f1f8769f7d Made optional_reference::ptr return nullptr of no reference is held
Makes more sense than propagating the exception from value(). operator-> *should* throw without value, though, so that was retained.
2021-02-16 04:16:38 +11:00
Charles Dang
e28d0399b4 Updated schema for [campaign] background 2021-02-15 16:45:19 +11:00
nemaara
f179fdb35f TRoW: use background 2021-02-14 22:24:11 -05:00
nemaara
565fae7c5b NR: use background 2021-02-14 22:16:16 -05:00
nemaara
157ed152e7 Liberty: use background 2021-02-14 22:13:19 -05:00
nemaara
b6be6c8243 AToTB: use background instead of image 2021-02-14 22:06:06 -05:00
nemaara
3d08a2a0db DiD: use background instead of image 2021-02-14 21:54:33 -05:00
nemaara
3e81f0e34e Add TRoW rebalance to changelog 2021-02-14 21:40:26 -05:00
nemaara
e238f6e9e0 TRoW: rebalance pass 2021-02-14 21:38:49 -05:00
Iris Morelle
e12f08f58d UtBS: Revert incomplete gender swap in scenario 9
No need to break UMC for the sake of historical accuracy.
2021-02-14 23:30:54 -03:00
Iris Morelle
e03ebed407 website: New Year copyright update
[ci skip]
2021-02-13 23:08:03 -03:00
Pentarctagon
a7aeff9e49
Changelog update. 2021-02-13 19:30:30 -06:00
Pentarctagon
093db78cc7 Add the Plan Unit Advance modification to mainline. 2021-02-13 19:16:37 -06:00
Pentarctagon
c05e39ecc1 Always have units with multiple advancements level up to the first one listed in the unit_type.
There's already enough randomness in Wesnoth; having the game randomly choose what a unit levels up to in a multiplayer game because it happens to advance on someone else's turn is unnecessary.
This also reduces the need to manually select a unit's advancement path for advancement planning modifications. For example, if you want your Mage to level up into a White Mage, this is now the default and doesn't need to be manually selected by the player.
2021-02-13 19:16:37 -06:00
Pentarctagon
53f9dbb51a Remove the Delay Advancements modification.
While implementationally it's very simple, the feedback so far (minimal as it may be) has been negative due to the side effects on existing gameplay mechanics:
* Delaying advancement until the next time it's the advancing unit's side's turn gives enemies a much larger window to kill the unit to prevent it from leveling up.
* The majority of units don't have multiple advancement options, so delaying their advancement as well isn't helpful.

Additionally, leaving this in for 1.16 would mean that it would not be possible to remove it in 1.17 or later without breaking any replays that did use it.
2021-02-13 19:16:37 -06:00
Iris Morelle
bbcf9db1b5 Update changelog 2021-02-13 20:05:18 -03:00
Iris Morelle
dc451cae24 campaignd: Fix minor log message typo 2021-02-13 20:03:12 -03:00
Iris Morelle
c5abf1bb00 campaignd: Fix UB when servicing [request_campaign]
std::distance(A, B) requires A and B to be random access iterators if
the expression B < A is even expected to make any sense. std::map
produces bidirectional iterators instead, so this code was causing UB
when [request_campaign] was used with a From version newer than the To
version (a.k.a. downgrading an add-on).

This fix also allows us to skip a lot of nonsense in the event that From
== To.
2021-02-13 19:50:07 -03:00
doofus-01
888edc85db
Units - minor fixes to Dunefolk - Merge pull request #5522
- Fix some sprite graphics configurations
 - Give mounted dunefolk the mounted undead variation
2021-02-13 12:54:25 -08:00
doofus-01
57d3539bfe units - make horse-based dunefolk have mounted undead variation 2021-02-13 10:05:16 -08:00
Steve Cotton
4a43d00522 Show a two-color tennis ball orb for the disengaged state (#5155)
As the disengaged state is part-way between the "partial" and "moved" states,
the orb has parts in each color. On the minimap these units are shown in the
partial color (which is also the color that would be used before this change).

This will match the mounted Quenoth units' "disengage" skill, when they
can still move but can't attack. It should also trigger for some UMC abilities
that get extra moves after a character attacks.

During testing, I found that TSG allows some of the bandits to attack on the
first turn of the bandit branch. There's no gameplay change there, but the orbs
make it much clearer that some units can still attack.

I think there are already too many preferences for orbs, so reused the existing
settings for the colors. A new "show disengaged orb" preference is added, which
when disabled shows the old partial orb instead.

Update the orb and ellipse sections of doc/manual/.

Notes about how I created the new orb image:

* create a color range to_ellipse_red with rgb=FF0000,FF0000,000000,FF0000
* wesnoth --render-image 'misc/orb.png~RC(magenta>to_ellipse_red)' images/misc/orb-ellipse-red.png
* open the orb.png and orb-ellipse-red.png images as layers in Gimp, add a layer mask to both of them
* use the layer mask to get each pixel from exactly one of the layers
2021-02-13 18:28:33 +01:00
Charles Dang
561cc33dc4
Upgrade to Lua 5.4.2 (#5535)
The change to static_cast for the definition of  LUAL_BUFFERSIZE replaces the fix previously used (d0100758f855ec0d8f30dff41e8a8b6ff2d45fda) for Lua 5.3. 5.4 removes the static alternative for LUAL_BUFFERSIZE. A better solution would probably be to disable the old-style-cast warning for luaconf.h, but I can't figure out how to do that so using static_cast is the easiest solution. Do note that change will have to be applied each Lua update like the aforementioned commit.
2021-02-14 02:07:12 +11:00
Charles Dang
6bb854408c
Merge pull request #5521 from MrTitainin/patch-1
Fixed unstore_unit lua code (issue #5519)
2021-02-14 01:42:50 +11:00
Nils Kneuper
04a3b2d002 updated Catalan translation 2021-02-13 12:13:21 +01:00
Nils Kneuper
ab0e590cb5 updated Czech translation 2021-02-13 12:12:14 +01:00
Nils Kneuper
23dd679e47 updated French translation 2021-02-13 12:11:35 +01:00
Steve Cotton
eab006f02c CMake: avoid unnecessarily remaking all .mo files on each build
All the .mo files had a dependency on the target directory, which meant that
every change to the timestamp of that directory caused all the files to be
remade; and each file remade caused a change to the directory's timestamp ...

Since CMake 3.0, "cmake -E make_directory" has been deprecated in favor of
"file(MAKE_DIRECTORY ...)", so use that instead of the custom command. This
means the directories are created when the cmake config is generated, instead
of during the subsequent make steps.

Note: the mo-update target which builds the .mo files is only run when the
build is configured with ENABLE_NLS=ON. Both before and after this change,
none of the .mo files are rebuilt when ENABLE_NLS=OFF.
2021-02-13 11:43:28 +01:00
MrTitainin
8db66e8551
Fixed lua [teleport] code
And changed [unstore_unit] to use table.unpack for shorter code
2021-02-11 19:45:21 +01:00
Andrey Bienkowski
09be367357 wmllint: Stop looking for wml tags inside [lua]
wmllint should not search for wml tags and keys inside [lua].
I caught it trying to add a _ in 23_Test_of_the_Clans inside a lua tag.
2021-02-11 18:10:39 +01:00
Charles Dang
137a511586 Wesnothd Connection: catch all exceptions thrown in the worker thread
This ensures a stray uncaught exception doesn't crash the game, since if an std::thread exists due to an exception, std::terminate is called.
2021-02-11 12:44:56 +11:00
Steve Cotton
1d90f704b4 DM S19: Change one more "un-life" to "unlife" 2021-02-10 10:27:41 +01:00
Andrey Bienkowski
5d344526b0
Fix several typos in wml (#5525)
* Fix month typo and add months to dictionary

* typo s/cuttle fish/cuttlefish/

The phrase "cuttle fish" is not in wiktionary.org. The unit id used in WML is left as-is ("Cuttle Fish").

* typo s/carvans/caravans/

* add spelling ol’; fix typo s/ol/ol’/

* fix typo s/alloting/allotting/

* Typo? s/movepoints/movement points/

* Typo s/critized/criticized/

* Typo: s/un-life/unlife/

* DW: typo: s/veterens/veterans/

* SoF: typo: s/fulfil/fulfill/

* SoF typo: s/Thursagen/Thursagan/

* SotA typo: s/permanantly/permanently/

* SotA: possible typo s/Rastaban/Ras-Tabahn/

* THoT: typo s/Aiglondor/Aiglondur/

* Use a typographic-style quotation mark

* Undo month name change

* Change spelling un-life -> unlife
2021-02-10 10:23:12 +01:00
nemaara
3737a6d8b0
Merge pull request #5502 from hexagonrecursion/nr13
NR S13: make all player sides have turns in sequence
2021-02-08 23:02:43 -05:00
Steve Cotton
76036bba28 Editor help: make the named areas topic visible, make "to load ..." translatable
This corrects a pair of editing errors, thanks to Celerini for reporting them.

(cherry picked from commit e272e4824f8e369c9487dd69920919fe3d9b3f11)
2021-02-08 23:41:43 +01:00
Andrey Bienkowski
80d0783677 NR S13a: reduce Hamel's gold 2021-02-08 12:13:42 +03:00
Charles Dang
4d4e8e617e Cleaned up usage of vconfig::all_children_iterator 2021-02-08 10:42:57 +11:00
Charles Dang
cd120f5118 MP Manager: avoid setting singleton ptr until connection is established 2021-02-08 10:38:40 +11:00
Charles Dang
1f7a0e2a13 MP Manager: used an optional for host parameter 2021-02-08 10:36:32 +11:00
Andrey Bienkowski
7754f3159b NR S13a: Change Hamel's side from AI to human 2021-02-07 15:53:28 +03:00
Charles Dang
fa95eb7d79 Wesnothd: avoid use of deprecated functions on Boost >= 1.66 2021-02-07 23:50:43 +11:00
Eric Gallager
6ad4ee9b7b
Legend of Wesmere: update Cliffs of Thoria difficulty (#5497)
LoW S10: reduce difficulty
2021-02-07 04:50:35 -05:00
doofus-01
d3f94aaaa6 unit animations - fix wrong-facing glitch for units with animated torch flame overlay - also allow for ne facing standing animations 2021-02-06 15:11:53 -08:00
MrTitainin
add999b9d5
Fixed unstore_unit lua code (issue #5519)
x,y were both binding to whole table instead of their expected values
2021-02-06 16:10:59 +01:00
Nils Kneuper
fb07c247e8 updated Catalan translation 2021-02-06 12:03:57 +01:00
Andrey Bienkowski
c42bf11424 Clarify hotkey names in the preferences dialogue 2021-02-03 19:13:58 -06:00
Andrey Bienkowski
4b0a4e4227 Delete the list of hotkeys from the manual 2021-02-03 19:13:58 -06:00
Michal Žejdl
3c41e55c5b change User to Custom to unify the help with the game 2021-02-03 19:12:07 -06:00