71599 Commits

Author SHA1 Message Date
Charles Dang
fac4a58ba6 Updated Visual Studio projectfile readme
[ci skip]

(cherry-picked from commit 8d2244628adbb2bf2199b297004f9428a512cbb5)
2018-10-07 03:18:32 +00:00
Iris Morelle
065501bfbf Sync changelogs across branches
[ci skip]

(cherry-picked from commit 139695d7b1fe97dc528d04f1d96d0435273d519a)
2018-10-07 03:18:31 +00:00
Iris Morelle
f1453d7f7a Fix up previous commit to match 1.14
[ci skip]

(cherry-picked from commit ecb80e607ec760af50162d354b045227dc15ab69)
2018-10-07 03:18:31 +00:00
Iris Morelle
74ed9d2dca Update changelog for the synced debug command UX changes
[ci skip]

(cherry-picked from commit 66b60f4731f663d1809a5652cb039c327b2732d6)
2018-10-07 03:18:31 +00:00
Iris Morelle
cdae5011bf scons: Sort help text with a custom function that will run on Python 3
(cherry-picked from commit 6b67c18d8927cf7f982a1feac867c301211a186e)
2018-10-07 03:18:30 +00:00
Iris Morelle
2584a21716 Sort scons --help output
(cherry-picked from commit a31b5ebcba90787eb9d0de8ceecfbc5293dd2eb3)
2018-10-07 03:18:30 +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
loonycyborg
6afc63bae9 scons: look for xhtml.xsl in several dirs as its location can vary
(cherry-picked from commit 3221e2259968d9378e5278918dbad702ec1f341f)
2018-10-07 03:18:23 +00:00
gfgtdf
263d5f38df disable debug command off-turn in mp
the serer wouldn't accept these commands anyways.

(cherry-picked from commit a1c06fbc65c380574f5449e5ea067d414544c155)
2018-10-07 03:18:23 +00:00
lundberg
5cd2d2403d Suppress VC warning 4706 for campaignd
(cherry-picked from commit d322e1fb973e89354b6d851a902c048702df94ba)
2018-10-07 03:18:23 +00:00
newfrenchy83
3b2cc5da78 Update wesnoth.cbp
(cherry-picked from commit cf70a6bb54fa6e6e1332ed5aa1abe1dc93de28a6)
2018-10-07 03:18:23 +00:00
Iris Morelle
5ae25a8453 Alphabetical order, alphabetical order, alphabetical order...
[ci skip]

(cherry-picked from commit 28c35e71fa49f76dc14b9f34d1c26cf9e0874328)
2018-10-07 03:18:22 +00:00
Sofartin
599405c9ea Fixed Xcode project and removed SDL2_ttf
(cherry-picked from commit bc027b4fba2787461fbf5e68a5b4eadd79068eb3)
2018-10-07 03:18:22 +00:00
Iris Morelle
bff5dcee30 Update changelog for issue #2732 and issue #2709
[ci skip]

(cherry-picked from commit 6f17695d7cde2af39db6d8ee85314cdfe64cbc87)
2018-10-07 03:18:22 +00:00
Iris Morelle
5c8eed358c Refactor synced debug commands prompt to bring the string count down to 2
Otherwise there are too many repetitive strings for translators to work
with, which is rather unfair for an exception like this during the 1.14
RC phase. It also makes for better code.

Also added an article "The" at the start of the strings for :command
notifications.

(cherry-picked from commit 56e7b01ac4cdfd6cf51c36cc7bf1cac33391cc58)
2018-10-07 03:18:21 +00:00
Iris Morelle
46eadd7264 gui2/text_box: Store hint text as a t_string
Storing it in a regular string results in issues with the game getting
stuck with the translation for the locale that was set during GUI2
initialization and not reflecting changes when switching languages later
on.

(cherry-picked from commit eacbc5f6959f57ff05451a2874a8e494ac3cb8db)
2018-10-07 03:18:21 +00:00
Gregory A Lundberg
ddc2ba4a00 Add fonts.uuid to .gitignore for fontconfig 2.13.0
(cherry-picked from commit 49ecb08338be1987250a2f6c6ca2b3f5fd13b9a1)
2018-10-07 03:18:21 +00:00
lundberg
140c077b6c Fix missing VC project options
campaignd project did not inherit warning supression for simple_wml from project/solution options.

(cherry-picked from commit 8b7eb536ebb34eb8915cd409d8917e1a2398f3f4)
2018-10-07 03:18:21 +00:00
Iris Morelle
bb95a35c3a New translatable version of the synced debug command prompt text
(cherry-picked from commit cbec739e238a603e579131016fc0d7c918ba1095)
2018-10-07 03:18:21 +00:00
Iris Morelle
c97251921a Set a custom dialog caption for the synced debug command prompt
This replaces the caption with something more apropos than the generic
"Save Game" caption. It necessitates a minor API change though.

(cherry-picked from commit b7e08977edd703ad9f146fd81768b2f09c39facd)
2018-10-07 03:18:20 +00:00
Iris Morelle
3fbeb809e7 Let synced debug command notifications be localized, fix them up a bit
There's a gettext call but there was nothing to mark the strings as
translatable in xgettext's view. Additionally, fixed a minor case of
missing the colon before the command name, replaced ASCII apostrophes,
and rewrote a notification with awkward wording.

(cherry-picked from commit ab67b402d1449384c12564e6a6a1d79a4bfb7e14)
2018-10-07 03:18:20 +00:00
Severin Glöckner
06751ff697 install.md: cmake version requirement had changed
[ci skip]

(cherry-picked from commit e0c9d7b9f6479fe028a7613b5f5148ab3b3d4bf6)
2018-10-07 03:18:20 +00:00
Charles Dang
6e59f4a800 Help: marked "Level" string in unit topic description translatable
I apparently forgot to do this at some point... Fixes one of the issues mentioned in #2732.

(cherry-picked from commit 0a67e9725c02989ed625d527725a5accec4dbdce)
2018-10-07 03:18:20 +00:00
lundberg
3f98bdb04b Fix VC warnings about upstream issues
Disable some warnings pertaining to Boost issues such as name-hides-global.

(cherry-picked from commit a8539cfca0cfd5c79430f430b6f6256987e37c28)
2018-10-07 03:18:19 +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
Severin Glöckner
d7d3bc692b remove outdated information from install.md
[ci skip]

(cherry-picked from commit 409c596fa134decdccc9d703468e2ce8d8b81c1e)
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
c27082b459 Fixup 76c2cbac46a6417
Using assignment is for 1.14. We can use `boost::optional::emplace` here on master.

(cherry-picked from commit 46598681b61d1c85b665ca902648b9d587903894)
2018-10-07 03:18:17 +00:00
newfrenchy83
ebb980a45e Implement [filter_weapon] in leadership and resistance abilities
Closes #2718

(cherry-picked from commit 76c2cbac46a6417bf15a52ce3c6589c0c3954c74)
2018-10-07 03:18:17 +00:00
Charles Dang
122976bef0 wesnothd: removed password reminder backend (closes #2753)
(cherry-picked from commit e52682e07b74e63cdcc670a9b6113f6c8934e86b)
2018-10-07 03:18:17 +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
gfgtdf
cd622afb0f fix playmp_controller reading later network packages
in linger mode.

playmp_controller::play_linger_turn calls play_slice after processing
end_linger/[notify_next_scenario] which would (after 'fix chat in
[delay]' commit) then read more data from the network in particular data
for the next scenario which will then be lost.

(cherry-picked from commit f219b527e4b5b83dade346a2091e45380c0961ef)
2018-10-07 03:18:16 +00:00
gfgtdf
a4c1a7f659 fix moves sometimes not undone when control is changed.
with the 'fix chat not working during delay/animation' it could happen
that play_slice_catch would process a incoming controller change in
which case that while loop would end without the code inside that 'if
(player_type_changed_)' being executed, which woudl lead to oos errors
since that client woudl have made moves that other players don't have.

(cherry-picked from commit 94aa24c5a80076feb16018e1e7939622934a3a29)
2018-10-07 03:18:16 +00:00
gfgtdf
7c13c40e1a fix chat during [delay] and animations
fixes #1856

(cherry-picked from commit 274da80788b3ec1c2517a9ed305d796d688382d3)
2018-10-07 03:18:16 +00:00
Hironori Fujimoto
9bb1168a6b Rename variable so that it's role becomes clearly
(cherry-picked from commit 6b98bbdca125a748bc4eafb5f54394d0f14a7177)
2018-10-07 03:18:16 +00:00
Hironori Fujimoto
db183b331a Use is_composing() instead of raw ime_in_progress_
(cherry-picked from commit 6212a62a985b60110a7350ed28bfb0601cc1d0b8)
2018-10-07 03:18:15 +00:00
Hironori Fujimoto
60f00b4a69 Remove private member 'ime_length_'
In order to get length of composition text, just compare text_ and
text_cached

(cherry-picked from commit 5e22b2b714d58b7f6041c323b0e4c9c7e02bc0b1)
2018-10-07 03:18:15 +00:00
Hironori Fujimoto
adda2d3062 Turn ime_in_progress_ off when composition text is nothing
(cherry-picked from commit 16a8ac7e4956bdf236b518e42913af1ae7360cbf)
2018-10-07 03:18:15 +00:00
Martin Hrubý
cf606d23f3 Drop OS X 10.7 and Growl support (#2749)
(cherry-picked from commit 39d1476ade2a438c783ee0570a51db12da30b33e)
2018-10-07 03:18:15 +00:00
newfrenchy83
4d28725441 Update wesnoth.cbp
(cherry-picked from commit f8abea0de496cdde1da854151a26b570fea06144)
2018-10-07 03:18:14 +00:00
Iris Morelle
b132db1602 Update credits
[ci skip]

(cherry-picked from commit 3c6bb665c6bd6686eeee2711534ee52fcd65ce5a)
2018-10-07 03:18:14 +00:00
Iris Morelle
ca2368edd1 gui2/unit_attack: Fix damage types and ranges being displayed in English
Part of issue #2732.

(cherry-picked from commit 84ce75af191590823033f3186213f1b39375934c)
2018-10-07 03:18:14 +00:00
Iris Morelle
82f728abd0 gui2/unit_attack: Fix alignments being displayed in English
Part of issue #2732.

(cherry-picked from commit 7056ae014ced381cec3e1fdd86a268749bb83562)
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