72946 Commits

Author SHA1 Message Date
josteph
b7964a1002 WML [message]: Add left padding when the portrait is shown on the right.
The text is now shown at exactly the same place regardless of which side
the portrait is on.

Fixes #1938.

(cherry-picked from commit fc9e5f0484bf4718390ed3ab01d5ae418f9cfacf)
2018-10-07 03:25:08 +00:00
joeylmaalouf
23df7b262f Menu: campaign order tweaks
(cherry-picked from commit 243a542eddb6f4938563b1e4a83968ac1112a9cd)
2018-10-07 03:25:07 +00:00
joeylmaalouf
1f1770362e Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222)
(cherry-picked from commit a3a9b723115ae0cd5a5cf51ec1fd46af833b1ea3)
2018-10-07 03:25:07 +00:00
Łukasz Hryniuk
1c57944c87 gui2: indicate that unit cannot advance
(cherry-picked from commit 7cf478e8d91eaefccce110d281790a8e3a4574e4)
2018-10-07 03:25:07 +00:00
Celtic Minstrel
317ef288c5 Update changelog
(cherry-picked from commit 100565c7d8eb0f67473a8b370495449397fd69af)
2018-10-07 03:25:07 +00:00
josteph
b69baf5793 HttT S17: Show the 'Comic relief' comment to translators, too.
(cherry picked from commit 31d333cc62b4a54c8d57bcbfc1ef425fd6b24d7d)

(cherry-picked from commit 046b141366bc1ef80d15447d46fc9d9fb33d0c10)
2018-10-07 03:25:06 +00:00
josteph
d209d6eedb HttT S17: Make Li'sar's dialog unconditional.
(cherry picked from commit 6ea39b33e690f796073e687896febb60785fb4d2)

(cherry-picked from commit c006072356737ef8199cb5a40e6aa626292e2553)
2018-10-07 03:25:06 +00:00
josteph
1001e45dfa HttT S17: Add comic relief.
(cherry picked from commit f3407fddc909fa05a34d34aee4afd2df7d30849e)

(cherry-picked from commit 7b2289f81843d5d9a040765cd071b50dc08ff9b8)
2018-10-07 03:25:06 +00:00
josteph
657100ff09 HttT S17: Further updates to dialog
- 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 f7d8d0d25723e84f5fb2cf1a4a5343c263090410)

(cherry-picked from commit 15acd756361a907b9796450f0dd0560b7b20b78b)
2018-10-07 03:25:05 +00:00
josteph
5787a8e4c8 HttT S17: Further tweak dwarf's dialog.
(cherry picked from commit 3e3bd320c9488a0a0bc71a636d442d64f24a8c0a)

(cherry-picked from commit 865dcbf3a4fff005b7a5c74d5286cb163a4842b5)
2018-10-07 03:25:05 +00:00
josteph
778080121f HttT S17: Correct pronoun.
(cherry picked from commit 96387a55d559de4e4aba4c81e788ee1b50f27a88)

(cherry-picked from commit 0e9e3b30f97300adec6e344be0fd11b4b3bb874d)
2018-10-07 03:25:05 +00:00
josteph
cebe98cc16 HttT S17: Add a po comments
(cherry picked from commit edcccc56a7b9bffdb78d20aa6cf10086e5f9da5b)

(cherry-picked from commit 960a8fcc9fcc694898e934a990f3c29cfffebec3)
2018-10-07 03:25:05 +00:00
josteph
d10c833c4b HttT S17: Change again due to an ambiguity.
(cherry picked from commit 18e886d82e3a192a82baea6d6f036e656836dc7f)

(cherry-picked from commit 25791d64e579de1ba2fe53043598923fd32282fc)
2018-10-07 03:25:04 +00:00
josteph
1e4c51faf0 https://github.com/wesnoth/wesnoth/pull/3473#discussion_r211090169
(cherry picked from commit bc52143390debcc165aa234616c174072aeb1b97)

(cherry-picked from commit c97fe98801b6629797afbb6ae797c444a24df034)
2018-10-07 03:25:04 +00:00
josteph
d456fe07b6 HttT S17: Explain why Mages of Light aren't considered by the filter.
(cherry picked from commit 4c2f4f7eda28cfaacd512153099df056100e602c)

(cherry-picked from commit 0a0920fe79960d8886fc63d70e05c80a4d88826b)
2018-10-07 03:25:04 +00:00
josteph
983972d949 fixup
(cherry picked from commit 62eb450da6319413f1f7adec75a30177aba00dc9)

(cherry-picked from commit 2c9aeec8b0eb47fd8d16d3242b47e27981395bc6)
2018-10-07 03:25:04 +00:00
josteph
083514231c HttT S17: Fix "naught" and explain why only high-level mages.
(cherry picked from commit 7ed9f2db9ad958286fb896d0930952c03614a954)

(cherry-picked from commit fff478112c6e7d790cee2df2103a4e55924cb3be)
2018-10-07 03:25:03 +00:00
josteph
13b00364e3 units: Add a po comment in Elvish High Lord.
(cherry picked from commit 1f0c466a3d806a89ce8069b464e357797799f06e)

(cherry-picked from commit 9072934d45a2db49053d511c2d8c5db8b707f34d)
2018-10-07 03:25:03 +00:00
josteph
1bbd40b7fb HttT S17: Add po comment
(cherry picked from commit b7c431e7b39418b23666e55f6286b1ad768e5979)

(cherry-picked from commit f1d20c1edb6872f63fb84286067782a2d29310f2)
2018-10-07 03:25:03 +00:00
josteph
2a21549bcb HttT S17: Explain the lava mechanic
Gameplay is not affected. The player can still lose units to {EXPAND_LAVA}.

(cherry picked from commit a3be91248753f9ddbc0d647a4d918e4f160b7d56)

(cherry-picked from commit de9541fd76fca9bd50e4bc71b85b2c95ded0e134)
2018-10-07 03:25:03 +00:00
Jyrki Vesterinen
cfb8a63bfe Changelog entries for changes I committed
(cherry-picked from commit 6234faa1002a1364c5893683b26770736e050c4f)
2018-10-07 03:25:02 +00:00
gfgtdf
74d5c427c1 fix #3532 : oos error in mp campaigns.
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 d0c0f406f25ce7a24184e44194b5b22071ebbd53)
2018-10-07 03:25:02 +00:00
loonycyborg
969fb71440 Prevent C++ exception from escaping from is_user_banned()
(cherry-picked from commit 0b9565375f4c27f59043ede643f2d360f2d3eec2)
2018-10-07 03:25:02 +00:00
josteph
f1e1a99bbd HttT S6: Support unlikely player behavior.
Trigger the undead reinforcements even if the player skips the main cave entrance.

(cherry-picked from commit 95b3ccd9fe0ba5f185f749ceac88188be7b591d9)
2018-10-07 03:25:01 +00:00
josteph
8e37c39f50 HttT S6: Trigger the additional undead as soon as the player touches the cave entry.
Seen in :debug with a Nightgaunt. Not sure if it can happen in normal play.

(cherry-picked from commit 9509eecced0b46435870d06d47a322408064e09a)
2018-10-07 03:25:01 +00:00
josteph
b46fedcd35 HttT S6: Allow canceling attack orders.
(cherry-picked from commit e50b6fa7bd72287e57517740e24b47de4079d35a)
2018-10-07 03:25:01 +00:00
gfgtdf
9d6613a8cc fix 3541 : crash in lua tstring comparision
(cherry-picked from commit 69cdbe8da76e37d4bb827dad97ce99d4ef16cde2)
2018-10-07 03:25:01 +00:00
gfgtdf
bc89512a5c add game_config.combat experience
and make [harm_unit] use these values instead of hardcoded 8*level for
killing and level for combat.

(cherry-picked from commit 3591e82586896c8923de1d45cf9c30d25c522a3f)
2018-10-07 03:25:00 +00:00
gfgtdf
21e6b399e8 fix #3396 lua_function= doesn't work in [effect][filter]
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 08b7d1b1ac2e469bab55c37fe73a40f0df603b04)
2018-10-07 03:25:00 +00:00
Severin Glöckner
c48735c0fb Core Macro Reference: Fix hint
[ci skip]

(cherry-picked from commit 00e41b9857e8dfdb5f603fe7d91a1a6e0725b8c7)
2018-10-07 03:25:00 +00:00
Severin Glöckner
b881c0ec1a TSG S5: fix typo in comment
[ci skip]

(cherry-picked from commit f358beda512f526992c7bd9d4fe3fbff685a7c3b)
2018-10-07 03:25:00 +00:00
Severin Glöckner
4d15d7e601 ANL: remove superfluous temp variables
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 7a29fc15b4a09837f4eaa2242ab5db4b230f4ef0)
2018-10-07 03:24:59 +00:00
Severin Glöckner
5ad321654b core macros: don't clear nonexistant variable
A leftover from the switch from {FOREACH} to [foreach]

[ci skip]

(cherry-picked from commit 001b444b10977051962572a991233553bd605384)
2018-10-07 03:24:59 +00:00
Severin Glöckner
5aaccf2d2a MP Tombs of Kesorak: adjust comment, avoid darkening overlay
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 0ef3c0d5f94f895c65598aee36d9ffde63d5766b)
2018-10-07 03:24:59 +00:00
newfrenchy83
c1a70068d5 Lua API: implicitly clear animator after playing it (#3536)
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 7d6e2b2a10a61e1704c38ea7ee6aa34178a29b38)
2018-10-07 03:24:59 +00:00
Charles Dang
489e958d9f Sync 1.14.4+dev changelog section
[ci skip]

(cherry-picked from commit 6eba0cbace9ac43f3680f2c0a57c0f26a04421d6)
2018-10-07 03:24:58 +00:00
Celtic Minstrel
1606fdd6b6 Allow lists in SLF location_id key (closes #3493)
(cherry-picked from commit 354f24e926eec0c1e60cc1fab65dda223cfe15f5)
2018-10-07 03:24:58 +00:00
Celtic Minstrel
42c48d1483 Move wmlxgettext to the data/tools directory so that it's automatically included in official packages
(cherry-picked from commit 59e78e556593cea7650998611640aeff3a6b288f)
2018-10-07 03:24:58 +00:00
Rikard Falkeborn
b71bb46d0b Bugfix generate random map unique names
The used names was never set so the check for duplicated names did not
work. Detected by cppcheck.

(cherry-picked from commit cc98bcd9d015a852dbec2053f300ce4682c4765d)
2018-10-07 03:24:57 +00:00
Martin Hrubý (hrubymar10)
49f6ef4aa7 Fix unit tests in Xcode
(cherry-picked from commit 1af805ecf74b1da30c916acac00b924f1016de79)
2018-10-07 03:24:57 +00:00
Pentarctagon
6714ef32e0 Fixes #3518
Certain distro/compiler combinations will apparently warn about not optimizing when _FORTIFY_SOURCE is set.

(cherry-picked from commit 09fcc6b0519d458cbc3e16788576000a8484020b)
2018-10-07 03:24:57 +00:00
mattsc
b8f1604366 EI custom ogre AI: remove a commented out line
(cherry-picked from commit 2591e435a5c71b0d840174c486fa2bde392d352a)
2018-10-07 03:24:57 +00:00
mattsc
c5e41497e1 generic_recruit_engine: remove unnecessary variable assignment
(cherry-picked from commit a7811395363f9edd1a40adb11e0748bd0b81c385)
2018-10-07 03:24:56 +00:00
mattsc
56934ad576 Lua AIs: use ai_helper.get_locations_no_borders()
(cherry-picked from commit dcadab91a418f4f7392bab2544367df580d46ecf)
2018-10-07 03:24:56 +00:00
mattsc
319c98d616 ai_helper: new function get_locations_no_borders()
(cherry-picked from commit 10463fdf608ade3ff223a58ad7cc43a1e475b803)
2018-10-07 03:24:56 +00:00
newfrenchy83
98bec00fac [heal_unit]: clear the animation after playing it (#3526)
Fixes another case of unit halo remaining after death.

(cherry-picked from commit 354162919741f1b5360120286bf389ecd963be79)
2018-10-07 03:24:56 +00:00
Jyrki Vesterinen
ee3e842cbc [animate_unit]: clear the animation after playing it
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 #3509. Closes #3520.

(cherry-picked from commit e63bd35f9d209f355400a743732ea2c4b91d5da4)
2018-10-07 03:24:55 +00:00
Jyrki Vesterinen
d8b26a92fb Fix build
Regression from commit ca6e7aef7db9e5625e4b5db8e9b30f863b83c582.

(cherry-picked from commit 9f43c4a10e536ef1ce496ac7371c8c8956d09445)
2018-10-07 03:24:55 +00:00
gfgtdf
647cdea397 fix #3515 : random start time
(cherry-picked from commit 8ed601461eac824f96eb9e6c02cf07a7fcf16f48)
2018-10-07 03:24:55 +00:00
mattsc
46efcf15fd Lua AIs: use ai_helper get_unit functions where applicable
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 75843541bcf92e743b911ef49046c54a050e8a0f)
2018-10-07 03:24:55 +00:00