Working master branch #3603

previously the server would send [speak] commands that had no undo=no attributes so that the game would remove the speak command from the replay instead of the actual undoable action when undoing an action. (cherry-picked from commit 02bed5c)

for extra safety we add code to ensure undo=no for [speak] commands to the client aswell, this is not really needed as i just added a code that sets undo=yes to the server code, but it's an advantage to be able to safely connect to older servers aswell. (cherry-picked from commit c685031)

broken in commit 'preserve traslatable strings in simple_wml.' (cherry-picked from commit 7e0d63d)

regression from 'fix require_scenario & require_era' (cherry-picked from commit 9a3917d)

suggested by soliton (cherry-picked from commit bd16aee)

(cherry-picked from commit f03e3e8)

boost::ptr_vector has some nice features, but vector<unique_ptr> is still easier to use for most people basicially becasue people know it better. Also boost::ptr_vector does not support move ctors and also does not use std::unique_ptr, probably because it tries to stay compatible with c++03 so one has to use 'ptr_vector::auto_type' with it instead which has a different interface than std::unique_ptr (cherry-picked from commit 7e2dc29)

(cherry-picked from commit 1646a7b)

substr cannot throw bad_lexical_cast (cherry-picked from commit e90f0fc)

(cherry-picked from commit 9bb601e)

(cherry-picked from commit 8d6524c)

`[terrain_mask]` had multiple unexpected behviours, see for example wesnoth#3364 in parituclar `wesnoth.wml_actions.terrain_mask { x =2, y=2, mask="Ww"}` will change the tile at (1,2) instead of (2,2), so instead of reusing the old terrain mask code i wrote a new function that behaves as one would expect. `wesnoth.terrain_mask` does not have a `border=` parameter but a `is_odd` parameter that specifies that a map is in the odd format __ __ /00\__/20\__ \__/10\__/30\ /01\__/21\__/ \__/11\__/31\ /02\__/22\__/ \__/ \__/ instead of the even map format __ __ __/10\__/30\ /00\__/20\__/ \__/11\__/31\ /01\__/21\__/ \__/12\__/32\ \__/ \__/ (Monospaced font required to see ascii images.) The lua function also has a lua interfacte, meaning it does not take wml tables but normal lua tables making it easier to use from lua code. (cherry-picked from commit a3367ee)

(cherry-picked from commit 6cd9de1)

and implement it using wesnoth.terrain_mask. This also fixes an issue where [terrain_mask] would not remove removed villages from the teams villages list after [terrain_mask]. This also adds an alignment parameter to [terrain_mask]. (cherry-picked from commit 09c56ef)

(cherry-picked from commit 7d44782)

The current implementation of the [music] tag sets the title after adding the track, however the title field was read only. This makes the field writable. (cherry-picked from commit 0f5899b)

(cherry-picked from commit ae11499)

(cherry-picked from commit 2f31345)

[ci skip] (cherry-picked from commit ed50b6b)

Fixes wesnoth#3392 & goes along with wesnoth#3372. (cherry-picked from commit ce6826d)

All mainline chance-to-hit weapon specials have ids, but it is not required for UMC specials. (cherry-picked from commit d421337)

(cherry-picked from commit c59a084)

[ci skip] (cherry-picked from commit 638fd4b)

Resolves wesnoth#3458. (cherry-picked from commit 50301f8)

(cherry-picked from commit cf999f7)

…nctions Fixes wesnoth#3474. (cherry-picked from commit 36cf8c8)

[ci skip] (cherry-picked from commit d3650a7)

Fixes wesnoth#3475 (cherry-picked from commit a3047f3)

…#3385) (cherry-picked from commit 3d47ed8)

…mment (cherry-picked from commit df8a6f5)

(cherry-picked from commit 6f8c504)

(cherry-picked from commit 7aced87)

So it may not be saved in ~/.xession-errors or cluttering up disk space another way (cherry-picked from commit c998f13)

changed as proposed by soliton (cherry-picked from commit 6998885)

[ci skip] (cherry-picked from commit 12369a2)

Otherwise people will keep complaining that it doesn't reflect the latest 1.14 version since the original number was valid for 1.14.0 and 1.14.4. [ci skip] (cherry-picked from commit c589e39)

…ome context (wesnoth#3481) * bugfix: wesnoth#3469 * wmlxgettext: removed a debug comment forgotten on the previous bugfix (cherry-picked from commit 4b79c26)

Some non-native English readers may find use of the word 'disposed' confusing. (cherry-picked from commit 087a18a)

previously attempting to place a starting location for side 10 or higher would result in a "invalid location id" error. (cherry-picked from commit cbf078a)

(cherry-picked from commit 6781fe1)

fixes wesnoth#3486 (cherry-picked from commit 08bb6a4)

This reverts commit 4f3ce68. This reverts commit 20128ac. see issue wesnoth#3454, there were problems caused by simple_wml when joining/observing games and this commit is the obvious suspect so i'm reverting it until we can fix that one. (cherry-picked from commit 6b58ce7)

(cherry-picked from commit 86eba2b)

(cherry-picked from commit 59299ad)

@CelticMinstrel

Thanks @CelticMinstrel (cherry-picked from commit 9e296b4)

(cherry-picked from commit eb76378)

Thanks 613TheEvil https://forums.wesnoth.org/viewtopic.php?p=619347#p619347 (cherry-picked from commit d27b09a)

Farms have a multi turn cycle: 1) crate farm (converts to Re) 2) end turn on the filed to harvest (Re has been automatically converted) 3) convert to grasland [othrwise the fields remains unusable for building] Step 3 was labeled the same as step 1. [ci skip] (cherry-picked from commit 1867274)

[ci skip] (cherry-picked from commit c3227f5)

… name. The internal name (Easy/Medium/Hard/Nightmare) will only be shown if the campaign is not installed, or doesn't declare the saved difficulty. (cherry-picked from commit 937e971)

Manual merge of pull request wesnoth#3490. I also ran pofix. [ci skip] (cherry-picked from commit 217eba5)

The tool that generates .po files splits lines in order to limit line length, and pofix can't track split strings. Thus, pofix search rules need to be shorter so that pofix finds the affected strings. I also moved the replacements to the right text domains, placed wesnoth-l to the right spot, and removed the "Asheviere is the Queen of Wesnoth" replacement because it isn't pofixable. (The second part of the string becomes just "Queen of Wesnoth." and "queen of Wesnoth." with lowercase Q is used legitimately elsewhere.) [ci skip] (cherry-picked from commit 3df91c9)

That comma wasn't supposed to be replaced with a period, and I didn't notice the mistake before pushing the commit. [ci skip] (cherry-picked from commit 20bfb35)

use one event with an object instead of two events [ci skip] (cherry-picked from commit bed3524)

because it is not obviously shown in the sidebar [ci skip] (cherry-picked from commit 4e11d41)

It's now possible to have this logic as part of [role] [ci skip] (cherry-picked from commit 440efd2)

This is one of the few cases where it is not only a refactoring, but has an actual advanatge to use [show_if] - the note can be removed from the objectives witout showing them to the player. [ci skip] (cherry-picked from commit 844e56b)

This is a relict from when they had not their own side, and needed to be killed to not be added to the recall list. [ci skip] (cherry-picked from commit baec30b)

Ethiliel remains on side 3, but a copy of her is added to the player's recall list for next scenario. The loyal trait is obtained at that point. [ci skip] (cherry-picked from commit 101cb21)

[ci skip] (cherry-picked from commit bbc31e6)

...which it neither burns or captures. The AI has two sides which are presented as one to the player. It's not the best approach, because it is possible that the player realizes it looking at the side informations, e.g. how many units the enemy side has listed there. This commit unifies both sides, while still keeping the units from formerly side 3 being unable to burn villages, but, as now being in a side with a leader, they can capture them. An advantage of having two sides was, that the units could have different AI settings, and that the leaderless side was not interrested in villages. The AI settings will be adressed in a seperate commit. (bug wesnoth#3032) [ci skip] (cherry-picked from commit d749005)

- The peasants told Deoran to go for the already defeated bandit leader. - The pesants were useless at that time - they are now instead spawned when defeating the bandit leader or when Deoran arrives, whatever happens first. They may still have a fight with remaining bandits – or provoke their attack. - The dialogue when reaching the citadel after having defeated the bandits got a slight change, to better switch to the victory dance event. (issue wesnoth#1954) [ci skip] (cherry-picked from commit 0c5467c)

(FR wesnoth#3316) This includes changing when the overlays and ellipses for the hero units are changed, and for better testing part of the event is split into a victory event in S6a. [ci skip] (cherry-picked from commit b681ad8)

[ci skip] (cherry-picked from commit 0dd48bf)

use monstrous event instead of monstrous macro [ci skip] (cherry-picked from commit 00574c0)

This follows the earlier commit which unified side 2 and 3. In the first rounds the AI behaves like former side 3, later like side 2. This is seemlessly possible, because side 3's AI settings were having practical effect at the beginning of the game, and side 2's conflicing settings don't come into action before the recruited troops met the ones of the player. (bug wesnoth#3032) [ci skip] (cherry-picked from commit ee09bc3)

[ci skip] (cherry-picked from commit 7c89b10)

This adds on the one hand a second leader with secons keep in the same caslte. for the same side, on the other hand ich changes the speack when they die. They adverturers are not assuming they killed the undead masters anymore if they saw the lich before. (mentioned in wesnoth#1954) [ci skip] (cherry-picked from commit f1a465b)

If no suitable forest hex is found, the radius of the locations considered is extended instead of placing the unit next to Ethiliel. Also, a change of behaviour: * non-free hexes will not be considered * the bodyguards won't be placed adjacent to other units, like the ambush ability works normally * this includes Ethiliel In general that means that units may be placed farther away than before. [ci skip] (cherry-picked from commit e43b350)

For some reason they never had one. [ci skip] (cherry-picked from commit 4fecc83)

That way less events need to be duplicated in scenarios. It also does not include the full Hylas death event in S7a to S9a. Previously the Jarek event was not present in one of the final scenarios, now both include it, but the shorter variant of it. [ci skip] (cherry-picked from commit 29b4196)

[ci skip] (cherry-picked from commit 8960da0)

It shall not hinder the recruiting capabilities of side 3 if the player spawns the monster. [ci skip] (cherry-picked from commit 63333c6)

Made it impossible that the undead leader can advance to a lich - though you do sth. badly wrong if he advances at all. Also, some more 1.13 syntactic sugar. [ci skip] (cherry-picked from commit a46d3f1)

Ensure that allying with the bandits does not trigger the lich sighted event. It's unlikely that the bandits advanced that far though. [ci skip] (cherry-picked from commit 657bf30)

…ipse And remove one mention of Mebrin before meeting him in S7b. [ci skip] (cherry-picked from commit 18db086)

On the other hand, all these units could as well use custom names. [ci skip] (cherry-picked from commit f04cdd3)

[ci skip] (cherry-picked from commit c030249)

[ci skip] (cherry-picked from commit 07c2125)

The text has already been prepared for this in 1.13 [ci skip] (cherry-picked from commit f84d680)

The invulnerable status is player-visible and does not insert new events which are checked at each attack. [ci skip] (cherry-picked from commit ddc763f)

Recalling units may increase the vision area when playing with shroud/fog. [ci skip] (cherry-picked from commit 5f7b185)

…wesnoth#3492) (cherry-picked from commit 24cb784)

(cherry-picked from commit 8f40b51)

(cherry-picked from commit a686639)

(cherry-picked from commit b3058e8)

(cherry-picked from commit 83c4ef2)

(cherry-picked from commit 3f54908)

(cherry-picked from commit 6f67055)

@jostephd

Thanks to @jostephd for pointing out that it shouldn't be removed. [ci skip] (cherry-picked from commit c59ae52)

These used to be accessible only through unit.__cfg or wesnoth.unit_types. The Fast Micro AI is not included here as it requires a larger clean-up. (cherry-picked from commit 8af988c)

The main reason for doing this, besides simplifying the code, is to avoid using the WML table dump __cfg, which is slow. This includes a change of the format in which the variables are stored, but since these are internal Micro AI utility functions, that does not matter. (cherry-picked from commit 133568e)

GCC 8.2.0 -Wnoexcept flags two functions which should be marked as not throwing. (cherry-picked from commit 3826c26)

No used outside the source file, so marked as a static function. (cherry-picked from commit 616ae9b)

(cherry-picked from commit aa59ac5)

All mainline chance-to-hit weapon specials have ids, but it is not required for UMC specials. (cherry-picked from commit 5335a2a)

(cherry-picked from commit 8a996c5)

(cherry-picked from commit 1680436)

Most of the Fast MAI attack utils had been taken from a more general codebase and included things not needed here. This AI is supposed to be a slimmed down version doing only the absolutely necessary in as fast as possible a fashion. (cherry-picked from commit f4f2a44)

(cherry-picked from commit cb423b2)

(cherry-picked from commit 80ae232)

This is mostly done for consistency across the Lua AI code (cherry-picked from commit 0e7c09f)

…use :debug hasn't been run. (cherry-picked from commit 012142a)

(cherry-picked from commit e2c591e)

AOI S3: Address Erlornas as "lord" in lowercase as done elsewhere in the scenario. (cherry-picked from commit 6a1b593)

(cherry-picked from commit 8fd1b82)

this also caused errors later when saving replays because the server would concatinate all [turn] leading to dublicate undo=no attributes. (cherry-picked from commit 144e8a1)

Now content that is loaded via [load_resource] is placed to the position where the [load_resource] was. This fixes a problem where previously one could not use lua variables/functions created by the [resource][lua] because the engine would put the [lua] tags from the [resource] after the [resource] from the scenario. (cherry-picked from commit 1ac635e)

... if they might not be needed. (cherry-picked from commit a23f06d)

... unless there is a difference between nil and false. Done mostly for consistency with all the other uses. (cherry-picked from commit 35d257f)

For consistency with the other mainline campaigns (cherry-picked from commit 1040dbe)

This involves making the output independent of the stats CA (which is not used any more) and adding missing output to some CAs. (cherry-picked from commit c2635ab)

(cherry-picked from commit ff86167)

(cherry-picked from commit 2436d70)

(cherry-picked from commit 5474785)

(cherry-picked from commit 4c61240)

According to po comments in S1, Baldras is Harper's mother's brother. Also change "mom"/"dad" to "mother"/"father" to match the general medieval setting of dialogs. (cherry-picked from commit bcb6153)

It probably doen't make a noticeable difference for these AIs, but in general we should not call the slow functions more than necessary. (cherry-picked from commit 42b4430)

This happens when the list comes up empty because of a non-matching filter, e.g. "Elvish Archer222" and the user clicks on one of the gender options in this state. Ideally we should clear the preview pane and disable the options and OK button here, but the former appears impossible and for some reason changing the pane's visibility in filter_text_changed() doesn't work reliably. (cherry-picked from commit 26629d4)

(cherry-picked from commit b7c7fca)

(cherry-picked from commit e078196)

The second event took as filtered unit an ogre that has reached the border of the map. Unfortunately, he was removed by the map before such event was fired, causing it to never happen. (cherry-picked from commit 643f133)

Also adds a new objective in S16, which was not stated but actually makes you win. (cherry-picked from commit 50e4cc5)

Most part of the old AI had no evident effect: the dragon just moved here and there without attacking you, and since he flied over shallow water, it was impossible to chase him. The micro ai makes Khrakhras wander around and attack you when you approach his castle. (cherry-picked from commit 64917b7)

... for consistency with the previous message stating that all orcs are killed by the elves. (cherry-picked from commit 34f417c)

(cherry-picked from commit 240d235)

Removes all the default values and improves the syntax where possible (cherry-picked from commit 9086e17)

They cannot be set for the MAI, and they would have to be set through 'cfg' not 'data' anyway. (cherry-picked from commit 62625fd)

(cherry-picked from commit 6b5edeb)

Now that all the AIs use external CAs, there is no need to use the persistent 'data' variable any more, unless information is to be exchanged between different CAs or is supposed to be persistent across save/load cycles. (cherry-picked from commit 3bfd59f)

(cherry-picked from commit 45a3bf9)

…tion (fixes wesnoth#1341) (cherry-picked from commit 3d481c1)

- allied AI leaders, whose death causes defeat, use passive_leader=yes - increased amount of money which the lich brothers have, if one has not the alternative leaders who can recall units - also increased Krash's gold to the same amount of as Eryssa has (they are the alternative leaders) [ci skip] (cherry-picked from commit 79993ea)

There has been a report that some scenario would be nearly unbeatable if they are empty in the first place, so this has the side effect of not showing the player that he misses something. (Nevertheless, they should be hidden) [ci skip] (cherry-picked from commit 47c3947)

They text is the same, whoever of them dies [ci skip] (cherry-picked from commit 2e7d901)

the one usage of type is left deliberately, to point out that it affects 3 instad of 2 or 4 types. [ci skip] (cherry-picked from commit ce05689)

So that it is possible to use the recruit_rushers CA without the castle_switch CA. (cherry-picked from commit 0bcb98c)

(cherry-picked from commit b92d8e8)

output redirection is only possible when starting from a shell [ci skip] (cherry-picked from commit a46c6ed)

The relative ranking of the CA scores is not changed, except for one case when two CAs had the same score. Reasons: - All scores should be lower than the scores of the default Goto CA (200,000) and the default scores of most Micro AIs (300,000). - Break tie, resulting in uncertain order of execution, of place_healers and retreat_injured CA. Healers should be placed first, to allow retreating injured units to adjacent hexes. - Set default for generic_recruit_engine to slightly above default AI recruiting score. That way it takes effect even if the default CA is not removed. - Increase move_to_any_enemy CA score from 1 to 1,000. It is still the lowest score that way, but allows for setting up custom CAs with even lower scores (even if it is just for end-of-turn statistics or the like). (cherry-picked from commit 35ba820)

This stopped being a rush AI long ago. (cherry-picked from commit ec45b53)

see wesnoth#3240 Just fixing the crash, not sure how the code should behave in this case, it would be nice if someone who knows more about the ai code would either implement that todo or remove the second warning. An alternative fix would be to move the 'calculate_moves' inside the ai_leaders loop. (cherry-picked from commit 18526e4)

former one is valid but deprecated [ci skip] (cherry-picked from commit d133b51)

They are as well used in the software centre. Having keywords is a bonus, even if they are not matched. [ci skip] (cherry-picked from commit 76e7c8d)

(cherry-picked from commit 23f3554)

[ci skip] (cherry-picked from commit eabf6e2)

[ci skip] (cherry-picked from commit d3d2dec)

ai_helper.robust_move_and_attack() does the stop_unit_moves automatically if the unit is at the destination hex. (cherry-picked from commit fdc3249)

(cherry-picked from commit 444d6d6)

One must compile wesnoth with -DLOCALEDIR=/usr/share/locale, as that's the place where the system looks for translations. (One can test it with gettext -s -d wesnoth "poisoned") This is according to the docs, needs more testing if it works. Doesn't work with Arch, though Arch doesn't support software centres well. [ci skip] (cherry-picked from commit 60f2158)

In Markup, only the normal quotes are allowed. [ci skip] (cherry-picked from commit b9396cd)

Live beiing defined as in get_live_units(), that is, non-petrified units (cherry-picked from commit a7d8024)

The ai_helper functions are optimized for speed (as much as possible in a general setting) and do all the necessary tests. For example, get_units_with_attacks() checks both whether the unit has attacks left, and whether it has any attacks in the first place. (cherry-picked from commit 7584354)

(cherry-picked from commit 8ed6014)

Regression from commit ca6e7ae. (cherry-picked from commit 9f43c4a)

This avoids a reference to the unit from being leaked, which prevented the unit's halo (if any) from disappearing when the unit died. Fixes wesnoth#3509. Closes wesnoth#3520. (cherry-picked from commit e63bd35)

Fixes another case of unit halo remaining after death. (cherry-picked from commit 3541629)

(cherry-picked from commit 10463fd)

(cherry-picked from commit dcadab9)

(cherry-picked from commit a781139)

(cherry-picked from commit 2591e43)

Certain distro/compiler combinations will apparently warn about not optimizing when _FORTIFY_SOURCE is set. (cherry-picked from commit 09fcc6b)

(cherry-picked from commit 1af805e)

The used names was never set so the check for duplicated names did not work. Detected by cppcheck. (cherry-picked from commit cc98bcd)

…ly included in official packages (cherry-picked from commit 59e78e5)

(cherry-picked from commit 354f24e)

[ci skip] (cherry-picked from commit 6eba0cb)

This prevents the animator from holding a strong reference to the target unit, which was keeping the unit object alive and thus preventing the unit halo, if any, from disappearing. (cherry-picked from commit 7d6e2b2)

A better image is needed, I remove the darkening overlay, because it would be missleading when a Mage of Light affects this field. [ci skip] (cherry-picked from commit 0ef3c0d)

A leftover from the switch from {FOREACH} to [foreach] [ci skip] (cherry-picked from commit 001b444)

The other variables in that event are not needed either, left them in for readability for the time being. [ci skip] (cherry-picked from commit 7a29fc1)

[ci skip] (cherry-picked from commit f358bed)

[ci skip] (cherry-picked from commit 00e41b9)

unfortunately this adds an annoying const_cast. The old code 'worked around' this by getting a nonconst reference to the same unit via the unit map, which i think is not better just hides the issue. (cherry-picked from commit 08b7d1b)

and make [harm_unit] use these values instead of hardcoded 8*level for killing and level for combat. (cherry-picked from commit 3591e82)

(cherry-picked from commit 69cdbe8)

(cherry-picked from commit e50b6fa)

…the cave entry. Seen in :debug with a Nightgaunt. Not sure if it can happen in normal play. (cherry-picked from commit 9509eec)

Trigger the undead reinforcements even if the player skips the main cave entrance. (cherry-picked from commit 95b3ccd)

(cherry-picked from commit 0b95653)

previously it would cause oos when a player that has not yet advanced to the currrent scenario sends random seed requests. (cherry-picked from commit d0c0f40)

(cherry-picked from commit 6234faa)

Gameplay is not affected. The player can still lose units to {EXPAND_LAVA}. (cherry picked from commit a3be912) (cherry-picked from commit de9541f)

(cherry picked from commit b7c431e) (cherry-picked from commit f1d20c1)

(cherry picked from commit 1f0c466) (cherry-picked from commit 9072934)

(cherry picked from commit 7ed9f2d) (cherry-picked from commit fff4781)

(cherry picked from commit 62eb450) (cherry-picked from commit 2c9aeec)

(cherry picked from commit 4c2f4f7) (cherry-picked from commit 0a0920f)

(cherry picked from commit bc52143) (cherry-picked from commit c97fe98)

(cherry picked from commit 18e886d) (cherry-picked from commit 25791d6)

(cherry picked from commit edcccc5) (cherry-picked from commit 960a8fc)

(cherry picked from commit 96387a5) (cherry-picked from commit 0e9e3b3)

(cherry picked from commit 3e3bd32) (cherry-picked from commit 865dcbf)

- Improve Konrad's line - Use variant portraits for Konrad and Li'sar - Update the mage's dialog to match the dwarf's (cherry picked from commit f7d8d0d) (cherry-picked from commit 15acd75)

(cherry picked from commit f3407fd) (cherry-picked from commit 7b2289f)

(cherry picked from commit 6ea39b3) (cherry-picked from commit c006072)

(cherry picked from commit 31d333c) (cherry-picked from commit 046b141)

(cherry-picked from commit 100565c)

(cherry-picked from commit 7cf478e)

…noth#1222) (cherry-picked from commit a3a9b72)

(cherry-picked from commit 243a542)

The text is now shown at exactly the same place regardless of which side the portrait is on. Fixes wesnoth#1938. (cherry-picked from commit fc9e5f0)

…th sides as already done for messages with one portrait. (cherry-picked from commit 3809b64)

[ci skip] (cherry-picked from commit c5d3539)

[ci skip] (cherry-picked from commit c5cabd9)

The braziers will also be animated, while they were still images before (cherry-picked from commit effb865)

1) Clear variables and macros 2) Remove default AI values 3) S7: Remove the ghost ship (cherry-picked from commit 9e8fb2d)

In exchange, the player will have 2 starting villages less than before (cherry-picked from commit 76f081a)

So we can see them while our ally is talking about them (cherry-picked from commit 29cec1a)

(cherry-picked from commit 49d12cf)

So remove his starting castle from the map; otherwise the user would see an empty keep and would know where the enemy is going to spawn (cherry-picked from commit 5dc6b79)

Alanin addresses Rugnur, and not Thursagan (cherry-picked from commit 20cd563)

(cherry-picked from commit 5013a9f)

(cherry-picked from commit bc4a5e8)

(cherry-picked from commit 67f4971)

(cherry-picked from commit 648035f)

(cherry-picked from commit 918a812)

(cherry-picked from commit eadbb1e)

(cherry-picked from commit 235a54a)

(cherry-picked from commit 7ac4029)

(cherry-picked from commit 389cd9a)

…e displaying objectives at start. Fixes wesnoth#3544. (cherry-picked from commit d99f5b8)

(cherry-picked from commit 9f58a80)

[ci skip] (cherry-picked from commit 09f418b)

(cherry-picked from commit c1ffe4c)

[ci skip] (cherry-picked from commit 57709d4)

Fixes wesnoth#3039 Until the elves attack the quintain it is not allowed to end turns before completing the given tasks. Display a message how to undo if there is not enough MP remaining to reach the current destination or an enemy by either unit. [ci skip] (cherry-picked from commit b16b7f0)

It's anyway a good idea to change this code. [ci skip] (cherry-picked from commit 5611181)

[ci skip] (cherry-picked from commit e5b4fcd)

[ci skip] (cherry-picked from commit b8d8be3)

[ci skip] (cherry-picked from commit a38466d)

[ci skip] (cherry-picked from commit 7bb419a)

[ci skip] (cherry-picked from commit 2ea2a4d)

makes it safe to dofile("on_event.lua") (cherry-picked from commit 6010ffe)

(cherry-picked from commit 9acb156)

(cherry-picked from commit 639c508)

Fixes wesnoth#3472 (cherry-picked from commit f7be872)

(cherry-picked from commit 1d1d260)

…nd start events (cherry-picked from commit b64f4b4)

* WML: Support [filter_side] in [item]. If [filter_side] is present then "team_name" is ignored. Fixes wesnoth#1477. * WML: Compare [item]team_name to [side]team_name using intersection. Fixes problems with substrings and when one or the other is a comma-separated list. See wesnoth#3533 * WML: Rename [item][filter_side] to [item][filter_team] * Add changelog entry (cherry-picked from commit 3a3b752)

…lient Simple_wml requires double quotes to be duplicated like this. (cherry-picked from commit 9536f38)

@newfrenchy83

Manual merge of pull request wesnoth#3550. Credit to @newfrenchy83. (cherry-picked from commit 79206d9)

Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680 (cherry-picked from commit 9abdc20)

…n't scroll to it. When the enemy leader and the unit it recruits are both invisible, scrolling to them would leak their location to the player. (cherry-picked from commit 4db9744)

(cherry-picked from commit e395706)

Fixes empty name abilities in help in Liberty S1. (cherry-picked from commit c88a799)

(cherry-picked from commit c55b0c6)

…mage. (cherry-picked from commit ae4ef05)

(cherry-picked from commit 248af05)

Removes final black screen that could be mistaken for a bug. Shows Delfador disappearing in front of the orcs more clearly. [ci skip] (cherry-picked from commit 75ab69d)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Working master branch #3603

Working master branch #3603

Commits on Oct 7, 2018