24339 Commits

Author SHA1 Message Date
Nils Kneuper
ff283e85d0 updated Chinese (Simplified) translation
(cherry-picked from commit fd4f36e3c93ea91fb020cff998f6bf7df97eee9d)
2018-10-07 03:18:58 +00:00
Sofartin
46dea87342 Add new packager
(cherry-picked from commit 769f102f2ec0438eec714cc2d541b5d46ac3113e)
2018-10-07 03:18:58 +00:00
Charles Dang
b6991ced4d MP Staging: made the faction select button about as prominent as you can get
[ci skip]

Thanks to grzywacz for pointing out the possible use of the unit icon.

(cherry-picked from commit dba3d409fcf64b356f34ad82a32fa762cc5dfb8c)
2018-10-07 03:18:57 +00:00
Charles Dang
cbcd728ad2 SotA S8: fixed inconsistent Ghost name (fixes #2846)
[ci skip]

The dashed version is used in prior scenarios.

(cherry-picked from commit 57c797d516bc909af36bced83b6a2bc2b90c0e42)
2018-10-07 03:18:56 +00:00
Charles Dang
b25f813d94 SotA S7: fixed inconsistent town name (fixes #2845)
[ci skip]

The two r's version is used in two other locations.

(cherry-picked from commit 565c4dbf60b38908025bae78d9a84002de6968f2)
2018-10-07 03:18:56 +00:00
Charles Dang
72d3f15dc6 MP Staging: make Faction Select button's purpose more clear
[ci skip]

(cherry-picked from commit 1f0588883cdb9158caff7f9bbceda01e0774f27f)
2018-10-07 03:18:56 +00:00
Charles Dang
1bd22008f0 SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)
[ci skip]

(cherry-picked from commit 77863cc52685dd33e1587a2e9e437f21d8f1574f)
2018-10-07 03:18:56 +00:00
Charles Dang
dc46369288 SotA S2: fixed units with translatable IDs........
[ci skip[

(cherry-picked from commit 48010f514e32deac20e286174c487d2aa13134ad)
2018-10-07 03:18:55 +00:00
stevecotton
e39a71fd22 LoW S09 Lua cleanup: fix a line that was missed in 3783693cb (#2835)
3783693cbe95be6c51553dfa71bf0ecd5ed8116f was a general rename of
'V' to 'vars', and this line was missed. It caused an error at the
start of S09.

[ci skip]

(cherry-picked from commit 2b406a37ec009e4a13251035267356b4d82ab1f1)
2018-10-07 03:18:52 +00:00
Iris Morelle
99d2919f5d gui2/log_settings: Make log options tooltips translatable
Fixes #2837.

(cherry-picked from commit 3967fd190e60b59cb9017bf4013a177dfcb44fdd)
2018-10-07 03:18:52 +00:00
gfgtdf
59cc2448dc fix [message] side_for= not working for the last side.
fixes #2776

(cherry-picked from commit 0f756b81899ed9e965eb4f40b67bfeaaa3a1e518)
2018-10-07 03:18:50 +00:00
Charles Dang
d52737b5d0 Swapped the position and formatting of game names and titles in the MP lobby
Addresses point 2 of #2815.

(cherry-picked from commit 6615aa7efe2de65362e3ec19ee3e72a65dea50d8)
2018-10-07 03:18:47 +00:00
Charles Dang
3f5d554f8c GUI2/Label: tweaked link color
[ci skip]

(cherry-picked from commit 1903b05ab11107fad80a38733a1af2bf1d00727b)
2018-10-07 03:18:47 +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
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
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
Celtic Minstrel
b1e96b08dd Support facing in [role][auto_recall]
(cherry-picked from commit ea0bcec92f021c9e2c1efc838508d5d662803771)
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
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
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
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
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
Nils Kneuper
4e653eba66 updated Chinese (Simplified) translation
(cherry-picked from commit 40d63a4a25f30bf5544348a57642d8939e780964)
2018-10-07 03:18:32 +00:00
Iris Morelle
391ddd45b2 wam: Add *.ini to upload blacklist to match the engine, reorder a few items
[ci skip]

(cherry-picked from commit 51111db8f7477bfab758d62d9e414405a8494e9c)
2018-10-07 03:18:30 +00:00
Hironori Fujimoto
36781c62d0 UtBS: Fix Nym's hit sound to be female
(cherry-picked from commit f63ca02984345d968a2b67e1a04e81fcd2b3a545)
2018-10-07 03:18:30 +00:00
Celtic Minstrel
1123c8a707 Remove some uses of set_wml_tag_metatable
(cherry-picked from commit 3939c332b908e9c9a4672688b4e0ef8095fc66ca)
2018-10-07 03:18:29 +00:00
loonycyborg
6750171fa1 pot-update and regenerate doc files
(cherry-picked from commit abcded267b886dec8799eadf47ffc3d6abae624b)
2018-10-07 03:18:26 +00:00
Charles Dang
e0b35791e2 GUI2/Text Box: refactored hint text interface
Previously, I had implemented the hint text ("Search)" and image (the magnifying glass)
as a custom text box definition. This caused some problems, though. Since the string was
hard-coded as part of a WFL formula, it couldn't be translated (see #2709 and #2732). It
also wasn't expandable to any other usecase.

Instead, I've added two new hint_text= and hint_image= keys to [text_box], wrapped the
"Search" text and magnifying image path in a helper macro, and refactored the default
definition to display the hint text and image when appropriate.

This also fixes a minor issue where selected text wouldn't remain highlighted when the
box wasn't focused when using the filter definition (it did with the default one).

This should fix the untranslatable "Search" text issue mentioned in both issues above.
The new string is in the wesnoth-lib textdomain.

(cherry-picked from commit db5abb7e637fd87699fce49a9543faafc3f58068)
2018-10-07 03:18:19 +00:00
Charles Dang
31320923bf GUI2/Canvas: allow formula values for [text] font_size=
(cherry-picked from commit 2b9c7b1abd7f881953552dac49d68f2aa5cf2525)
2018-10-07 03:18:19 +00:00
Celtic Minstrel
d72612443f Allow percentages in [random_placement]num_items=
(cherry-picked from commit 229d2f04831fc75a154b5b718c7d308fb3d81217)
2018-10-07 03:18:19 +00:00
Celtic Minstrel
0131631220 Allow WFL for [random_placement]num_items=
(cherry-picked from commit e4a2c141776124c4e0b16677265c4623a4a02aad)
2018-10-07 03:18:18 +00:00
Celtic Minstrel
c023f7b222 Fix typo in 1dd411a84eb6a45c81d14359aaaec7af34351a39
(cherry-picked from commit 4427ee19362bc739a51945b9f2b2eec59de7010c)
2018-10-07 03:18:18 +00:00
Charles Dang
717511a428 MP Login: removed Password Reminder functionality
Resolves #2748.

Essentially, all this did was tell users to go use the forum, so it wasn't worth
it to keep it and solve the infinite loading screen issues it was causing.

The server backend still needs to be cleaned up.

Also removed a dead reference to some "Change Username" button in the Login dialog's
code.

(cherry-picked from commit ebec4d6ce8fd8e46ce1d8a4bb4f5d04fddd87c72)
2018-10-07 03:18:17 +00:00
Iris Morelle
b132db1602 Update credits
[ci skip]

(cherry-picked from commit 3c6bb665c6bd6686eeee2711534ee52fcd65ce5a)
2018-10-07 03:18:14 +00:00
Celtic Minstrel
02b6987158 Support to_location in [move_unit]
(cherry-picked from commit 1dd411a84eb6a45c81d14359aaaec7af34351a39)
2018-10-07 03:18:13 +00:00
Celtic Minstrel
d2a465a126 Support formula= in [variable] ConditionalWML
(cherry-picked from commit 4e52d62963b10c26f33bccfcbad758c0072da393)
2018-10-07 03:18:12 +00:00
Charles Dang
9a8462eff7 EI: fixed another Lua syntax error from 3783693cbe95
[ci skip]

I misread the intent of that line in the original. It was supposed to clear the
var, not set it.

(cherry-picked from commit bad574f7c8f6106e6879c14318f3fcf0ec4cc2bf)
2018-10-07 03:18:12 +00:00
gfgtdf
48fee80ac6 remove a [on_redo]
since it was removed in 10561d3e539e6c92aa99d164bbe5bb106c7f35fd this will cause errors. Please make sure it is not used in mainline before you remove something.

(cherry-picked from commit 83007d4825c0a9daca158ec821da34c8968b7536)
2018-10-07 03:18:11 +00:00
pentarctagon
55ec77b7c4 Add the updated Dunefolk race description.
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=375#p624668
[ci skip]

(cherry-picked from commit 3b5cbc3e3c5e7529412ba38e64145b9303474da3)
2018-10-07 03:18:07 +00:00
pentarctagon
0c69e40d52 Remove deprecated Khalifate references.
(cherry-picked from commit 994e6efa796681e0952d4aeb623adcf3cf75d1ef)
2018-10-07 03:18:07 +00:00
Charles Dang
d5227d8fab Added two missing textdomain headers
[ci skip]

Should fix two of the issues mentioned in 2709.

(cherry-picked from commit 8d1ec6216bb336f29f5e213df5b1418703cdc0a0)
2018-10-07 03:18:03 +00:00