71800 Commits

Author SHA1 Message Date
Celtic Minstrel
47dd4eb377 Add [filter_second_weapon] to leadership and resistance abilities
Closes #2761

(cherry-picked from commit 7f60fb0fbc3b8245562503376905a16ab51a8d13)
2018-10-07 03:18:46 +00:00
Martin Hrubý
b79cb16edd Updated changelog style (#2680)
* Updated changelog style

I have to do that because maximum size for textfield is 1000x1000 so full changelog doesn't fit there

* Disaled Spell Checking and bumped to 1.13.13

(cherry-picked from commit bca6203bf45b44515603918232950a58b3a45cf8)
2018-10-07 03:18:46 +00:00
Steve Cotton
e851bf877a THoT S12 Fix some "x=" tests that should be "x,y=" tests
Taking the chest south of the start hid the door and chest that are
north of the start.

The sneak-door opened much earlier in the level, allowing the undead
from the south-east lich to go north to the spider room.  The ghosts
and nightstalkers that are supposed to ambush the player's forces in
the south (after opening the 3-hex door) instead go north and end up
joining the spider fight.  The slower-moving undead also go north,
and are easily fought one-by-one in the sneak passage instead of the
south-east.

[ci skip]

(cherry-picked from commit 2caed06cdb0847c7b6d14531647a7b2cbede1505)
2018-10-07 03:18:46 +00:00
Nils Kneuper
b4736dcc52 updated Polish translation
(cherry-picked from commit 65f690d905b26a404b646e0523f38568dea3c0d3)
2018-10-07 03:18:45 +00:00
pentarctagon
f4c221216b Create travis dockerfile in the travis script step.
This allows having multiple Dockerfile-base-* files without also needing to add a separate Dockerfile-travis-* file due to the FROM line changing.

(cherry-picked from commit 3f67c2fbf051aa9e322defb66c782477cd53b8bd)
2018-10-07 03:18:45 +00:00
Celtic Minstrel
5e4b5a56b2 Support location_id in [teleport]
(cherry-picked from commit fed46ec45f37baab8bd4491f4b67492256e42132)
2018-10-07 03:18:45 +00:00
Celtic Minstrel
83a6243fb9 Fix incorrect error message when encountering an unknown persistent tag
(cherry-picked from commit d2a8c5bb3200898a068aa24b7b968e444c7dc851)
2018-10-07 03:18:45 +00:00
Steve Cotton
53780f5165 THoT S12 Put the sneak-passageway's door on the right hex (fixes #2804)
This matches with the "Another old caved-in passageway..." event
around line 835, the trigger is on 55,33 and the walls that open are

        [terrain]
            x=55,55
            y=34,35
            terrain=Uu
        [/terrain]

Debian bug #483893, for which the original fix in
4c473187e658607b17c113d66b2bf549e48e41e5 changed the wrong digit.

This is a cherry-pick from 1.14 to master (fixes #2804) of
bcaac1ef (the change) and 5b7aca97 (the changelog).

[ci skip]

(cherry-picked from commit d6661fdb802a06050a9a76693c40566e9ecbdc10)
2018-10-07 03:18:44 +00:00
Nils Kneuper
9160f11297 updated Spanish translation
(cherry-picked from commit 7f35558799f55cd36bc738ceb8ce34a9e1ba143c)
2018-10-07 03:18:44 +00:00
Nils Kneuper
f7b66ca40e updated Czech translation
(cherry-picked from commit 742c378361f43a49f20b3d7f11061da6ea575166)
2018-10-07 03:18:43 +00:00
Sofartin
37795f4271 Remove redundand cp
(cherry-picked from commit 62febff94ea444e3b09ce599f2fa497bf639bde8)
2018-10-07 03:18:43 +00:00
Sofartin
f9c416ad07 Enable Testability for macOS DEBUG builds
(cherry-picked from commit 2e2015b6da71a918db32e216a1bd30be51980830)
2018-10-07 03:18:43 +00:00
Sofartin
d9a10089e8 Fix Wesnoth's Application Support dir name
(cherry-picked from commit 0a9b10cfa8863b56fc8f309fb49e2fdbbd516c53)
2018-10-07 03:18:42 +00:00
gfgtdf
222d29dfef guard against calling user_choice_manager::pull() recursively
(cherry-picked from commit 9593062fc65eb1769ebdab16ed4b1d380e6aaa69)
2018-10-07 03:18:42 +00:00
gfgtdf
0a32ffd16e treat local choices as like sycned contexts in replay.cpp
this makes more sense as the game cannot handle sycned commands while
executing local choices. It also fixes an OOS in
wesnoth.synchronize_choices

(cherry-picked from commit bce8c29568a0ba28455579e0057180f00bdd9190)
2018-10-07 03:18:42 +00:00
gfgtdf
85922c67e5 pull remote user input even if we are doing a local choice.
this mainly effects wesnoth.synchronize_choices:
previously the client would not process incoming choices from other
players while it was exeucting its own local choice (usually a dialog).
The problem this commit fixes is that with the old behaviour any choice
from another player would block the incoming queue, in particular
chatmessages after that command would be delayed until the
wesnoth.synchronize_choices is finished.

(cherry-picked from commit edd7a82255e6ec7d8882900e0df56fb3af853436)
2018-10-07 03:18:42 +00:00
Nils Kneuper
7257d555f2 updated French translation
(cherry-picked from commit a32d689c46a2a71c958007695eab953637ecb9f9)
2018-10-07 03:18:41 +00:00
ln-zookeeper
8b4032436c ANL: Fixed scenario brokenness stemming from force_lock_settings=yes
[ci skip]

(cherry-picked from commit d0a2fde239d86d9d539846e001f96f342383ad0d)
2018-10-07 03:18:41 +00:00
Sofartin
c5ab887136 Remove rest of Growl things and CodeSign everything after copy
(cherry-picked from commit 917401acaa1d0e98b0946c36fd2ab857c3476cc0)
2018-10-07 03:18:41 +00:00
Celtic Minstrel
5a30e97c91 Update changelog
(cherry-picked from commit 8becc799c1b5cce8f08d756dfb41628cb5c3be68)
2018-10-07 03:18:40 +00:00
Celtic Minstrel
755816c4a4 Fix an incorrect error message in [clear_global_variable]
(cherry-picked from commit 6184489a6523ef91433cf894825184e9011177c2)
2018-10-07 03:18:40 +00:00
Celtic Minstrel
b1e96b08dd Support facing in [role][auto_recall]
(cherry-picked from commit ea0bcec92f021c9e2c1efc838508d5d662803771)
2018-10-07 03:18:40 +00:00
Celtic Minstrel
fb99db6cd1 Support force_scroll in [move_units_fake] (same as in [move_unit_fake])
(cherry-picked from commit 325f4c40705b96ed4f5a009bfb76e0d30297743c)
2018-10-07 03:18:40 +00:00
Celtic Minstrel
b35a7f7352 Support root=cube and root=int in [set_variable]
(cherry-picked from commit 7a3d6f958a2f8c89488a7a3d2439c37ae50032c8)
2018-10-07 03:18:39 +00:00
Celtic Minstrel
12ada04b8f Use wesnoth.format instead of string.format for translateable strings in [objectives]
(cherry-picked from commit 15ae9fcb0cc93da52c4ee1100c4422d815b8b28d)
2018-10-07 03:18:39 +00:00
Celtic Minstrel
b5b87ef373 Nicer handling of some Pango formatting attributes in [message]
(cherry-picked from commit c835e5b7e660e0842ab765d6cab7615a8790af2b)
2018-10-07 03:18:39 +00:00
Celtic Minstrel
aef2b5eb9a Remove speaker=id support from SUF
(cherry-picked from commit d48206bdbe73c1060f1705ca07d3ee02641f85c1)
2018-10-07 03:18:39 +00:00
Celtic Minstrel
05a45b8cd1 Handle speaker=id directly in [message] instead of relying on SUF
(cherry-picked from commit 2bd2a8b1b6d7bba67b6d1b4eb0e03dca56f5a54a)
2018-10-07 03:18:39 +00:00
Celtic Minstrel
52d3b7bb6a Support [set_variable]round=trunc
(cherry-picked from commit beb5dc75aaa60af30dcfe58074771080b5da3aeb)
2018-10-07 03:18:38 +00:00
Celtic Minstrel
6c068684d6 Add a way in [filter_wml] to match key values against a glob
(cherry-picked from commit 5ee9b094708e456e94e1b6ac2309bccac3d03a9d)
2018-10-07 03:18:38 +00:00
Celtic Minstrel
165e8a63fa Fix [filter_wml] implementation so that [or] tags actually work
(cherry-picked from commit b483d96f500827ccacc78f3c2e89fc6690a3d2df)
2018-10-07 03:18:38 +00:00
Vasya
fa71ab4be0 Lua API: simplify functional.reduce (#2788)
simplify code and remove `indentity or 0` VS `indentity` inconsistency.

(cherry-picked from commit 2b8782923a758eee2e167e5c4097f2803e6e2be6)
2018-10-07 03:18:38 +00:00
Celtic Minstrel
0d1df0f2d7 Fix unintended change to the semantics of [modify_side]income=
(cherry-picked from commit 79bc18fe9522049d1844a99e37d58eab43898941)
2018-10-07 03:18:37 +00:00
doofus-01
23ba088e22 [UtBS] Quenoth elf animations (#2679)
* sun-shyde standing animations, draft

* additions to sun-shyde floating animation

* singer defense animation

* defense animations for sun-singer and sun-shyde

* try to make scout less leaning backwards

* champion defense animation

* fixing and rounding out basic animations (esp. wrt to floating/standing) for sun_shyde

(cherry-picked from commit 816dd075dcf36e154475fdd84043680d49ad58c1)
2018-10-07 03:18:37 +00:00
pentarctagon
dcf2767a14 Add using dockerfiles based on the LTS and BRANCH env vars
This makes it simpler in the future to have branches that have dependencies that are different from master, rather than having a single image with all necessary dependencies installed, which may at some point end up not being possible to do.

(cherry-picked from commit 1bb5fdf2830515d33793c52f298d305bd12b5a60)
2018-10-07 03:18:37 +00:00
Celtic Minstrel
1071fc7d2b Fix scenario editor writing to wrong key
(cherry-picked from commit dd4f80fdd1fb22ebee4c6ec1bf883611e0e823d2)
2018-10-07 03:18:37 +00:00
Nils Kneuper
79e6e578d2 updated British English translation
(cherry-picked from commit 57c1a671344d38705d918cce7a2208273a7c9f9b)
2018-10-07 03:18:36 +00:00
Nils Kneuper
b02b6d0853 updated Ukrainian translation
(cherry-picked from commit 4bcfada88a009301c8dbf6a1513cb1395a090432)
2018-10-07 03:18:36 +00:00
Nils Kneuper
b2d715a4da updated Scottish Gaelic translation
(cherry-picked from commit f19db187fab50e6a709c6bc3a737b996ac8e3756)
2018-10-07 03:18:35 +00:00
Iris Morelle
a8fda1e0eb wesnothd, campaignd: Fix warning about uninitialized field on _WIN32
(cherry-picked from commit 8a905134a4fd6e230d978e59a91615b37072461c)
2018-10-07 03:18:35 +00:00
pentarctagon
602a914698 Don't copy the .git directory into docker.
(cherry-picked from commit de48b9fbb13331a8a38911ee0ece47fd8f95d178)
2018-10-07 03:18:35 +00:00
Wedge009
e1506f86bd 'moreso' isn't a word in any dialect of English.
[ci skip]

(cherry-picked from commit fb866c6d1310d8398f0f481a8ab16b1606286cdd)
2018-10-07 03:18:35 +00:00
Victor Sergienko
fd480bbd17 Credits for Chinese translation of iOS announcements
(cherry-picked from commit 004d7b541b19cdb29c9be3b8dae80c65be7f4d48)
2018-10-07 03:18:34 +00:00
Martin Hrubý
ef199d4264 Updated Xcode's README.md
(cherry-picked from commit 212cb9be186c1e95d5a22c4c7696508da1a122d9)
2018-10-07 03:18:34 +00:00
pentarctagon
eed7e5d8c6 Remove tools-external-libs.
Also put Boost_RANDOM_LIBRARY, CRYPTO_LIBRARY, and MYSQL_LIBS into server-external-libs.

(cherry-picked from commit 0bbc78945ee9945be708396f71d80d3869a31951)
2018-10-07 03:18:34 +00:00
Iris Morelle
d9bfb7511c SotA: Drop UMC translations section from the campaign's credits
[ci skip]

(cherry-picked from commit 56470323c377ea70cb71de950b1a97ba090dddd0)
2018-10-07 03:18:34 +00:00
Iris Morelle
97fbeb6c7d UtBS: Hide technical terrains in the Help browser
[ci skip]

(cherry-picked from commit 9808a6a7223cb486cf41d85d66ca726836aff009)
2018-10-07 03:18:33 +00:00
Iris Morelle
c38811f310 Update changelog
[ci skip]

(cherry-picked from commit 0cdee6b04c8082bf99dc4111609802beb41439e6)
2018-10-07 03:18:33 +00:00
Iris Morelle
6f5f1482d2 cmake, scons: Drop option to enable or disable the removed SDL_SavePNG code
Commit dfc42e8a8dd550ca04ae16e2d2d7ebffbba0bc21 removed said code since
Wesnoth can use IMG_SavePNG() from SDL_image 2.0 instead. However, the
author left the build-time configuration options intact, and also part
of the necessary code for CMake to link Wesnoth against libpng.

Note that this change also eliminates an unnecessary direct link-time
dependency on libpng when using both CMake and SCons.

(cherry-picked from commit 4799ca05fe40838c41814433780d0464d9b8f071)
2018-10-07 03:18:33 +00:00
Nils Kneuper
0b860acf00 updated Spanish translation
(cherry-picked from commit 065e8cc1280c32ced9e2797ccaf836263631a618)
2018-10-07 03:18:32 +00:00