24317 Commits

Author SHA1 Message Date
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
Lari Nieminen
fa1e37d71d EI: Fix Lua syntax error from 3783693cbe95
[ci skip]

(cherry-picked from commit 4d86af796ca46f204f958b712465a05bdfa0de75)
2018-10-07 03:18:03 +00:00
ln-zookeeper
733d8ff979 EI S03: Changed Mal-Kallat back to male
He was changed to female in f4d67031a436 even though he's addressed as "brother" in dialogue. Reported on the forums.

(cherry-picked from commit 3be2ff518781c7a7104e810707be64567cc26e27)
2018-10-07 03:18:03 +00:00
Iris Morelle
1ab0301064 wam: Update description and name for Modifications
They are no longer just for multiplayer mode (see issue #1475, commit
a09e2bb8583c6125f8c4e3157d6eba8bbd800b62).

[ci skip]

(cherry-picked from commit 39b05dd0dbc1fc14e50e7db19401651ec3eae154)
2018-10-07 03:18:02 +00:00
Celtic Minstrel
d849dfcf89 Add the advanced prefs entry for the deprecation setting
(cherry-picked from commit 9902a2df31aaa0755c10d2dbf8ea2954087e6a43)
2018-10-07 03:17:58 +00:00
ln-zookeeper
9b7e1ed383 UtBS: Corrected Sun Singer movetype from float to foot
(cherry-picked from commit 3cea4790b872803063854e28bffa40999ae00258)
2018-10-07 03:17:55 +00:00
Iris Morelle
0b3f14d63e campaignd: Set port allocation for version 1.14 2018-03-18 17:25:23 +11:00
Charles Dang
a43623ff2d Screenshot Notification: cleaned up and tweaked a few things
* Added textdomain closure missing from 267510ea076ce317d323da54bb81ccd255b93284
* Avoid use of invalidate_layout by having an em dash in the size field prior to
  saving. That's needed since GUI2 doesn't expand the label's canvas if its text
  is initially empty.
* Use a better button definition for the View button.
* Grouped Save and Close buttons together
2018-03-18 17:01:26 +11:00
Charles Dang
a18522acb8 File Dialog: removed label keys with empty values
[ci skip]

This doesn't do anything.
2018-03-18 17:01:24 +11:00
Celtic Minstrel
5008c72a22
Fixup wml.all_variables 2018-03-18 01:38:39 -04:00
doofus-01
f2cf0f1e5a
defense animation for Quenoth Warrior (will add Champion later) (#2595)
I'm going to merge this, possibly for git-illiteracy reasons, but if this causes problems, it doesn't have to permanently taint the stable branch.  We can fix it later.
2018-03-17 19:06:16 -07:00
Celtic Minstrel
7fcc813438 One more dunefolk tweak
Revert the change to Marauder blade resistance and instead raise Raider blade resistance
2018-03-17 18:52:31 -04:00
Celtic Minstrel
8d74b72031 fixup! Fix missing return in on_event() 2018-03-17 17:21:20 -04:00
Celtic Minstrel
a314876bf2 Use new persistent tags interface for [object] [objectives] [item] 2018-03-17 17:16:23 -04:00
Celtic Minstrel
c266b35528 Fix rabbits AI being broken by save-load 2018-03-17 17:16:22 -04:00
Celtic Minstrel
ddcbb4cb50 Add a more convenient way of registering custom saved game data 2018-03-17 17:16:22 -04:00
Celtic Minstrel
68d545c3be Add a couple more WML utility functions 2018-03-17 16:48:06 -04:00
Celtic Minstrel
d4e08359dd Fix missing return in on_event() 2018-03-17 16:48:04 -04:00
Celtic Minstrel
e776635023 Clear up redundancies in helper compatibility and deprecate the array functions 2018-03-17 16:48:03 -04:00
Celtic Minstrel
4b08a40181 Deprecate wesnoth.set_music 2018-03-17 16:48:02 -04:00
Celtic Minstrel
6e4d09d2a5 Bump up a couple of deprecation levels at @vultraz's request 2018-03-17 16:48:01 -04:00
Celtic Minstrel
08ec9017b5 Lua API: Some tweaks of the experimental wml module 2018-03-17 16:48:00 -04:00
Celtic Minstrel
23aac4f72f Cleanup of fef953a48e258e5b07ff4559eeff5571103d58c1
- Fix the rabbit AI
- Enable invoke_synced_command to also call (some) built-in commands
  and give an error message in the case of an unknown command
- Remove some unnecessary implementation details
2018-03-17 16:48:00 -04:00