72725 Commits

Author SHA1 Message Date
Elvish_Hunter
ef51a288d8 wmllint: avoid inserting image=wesnoth-icon.png if there's already an image
(cherry-picked from commit 3b8a6845514f9a95365d9f80d8960e4590cbbefb)
2018-10-07 03:24:05 +00:00
Elvish_Hunter
8fe84b9815 wmllint: fixed 'unknown id' errors in [fire_event] referred to event IDs
(cherry-picked from commit c08963a2e736a185ee338e30a560d5949233705f)
2018-10-07 03:24:05 +00:00
Elvish_Hunter
4b81eb5081 wmllint: fixed a regex that didn't match augmentation tags
(cherry-picked from commit cc178ad4742472397685a39e93074139225767f1)
2018-10-07 03:24:04 +00:00
Elvish_Hunter
8b32f89a1f wmllint: added side_name to the list of translatable keys
(cherry-picked from commit 8bea4198992d1c794688ef1dc97cc82a958a8004)
2018-10-07 03:24:04 +00:00
Elvish_Hunter
0ccf6ae1ea Prevent wmllint from converting Dunefolk names similar to Khalifate units
(cherry-picked from commit de99a381723dad41153917696e5468b5e0a99894)
2018-10-07 03:24:04 +00:00
Elvish_Hunter
f25f1316cc wmllint: added a missing conversion rule for the Qatif-al-nar unit
(cherry-picked from commit 3caf1283784b9533f601e6c0a7f91a112d7ae69c)
2018-10-07 03:24:04 +00:00
Jyrki Vesterinen
25e9087304 Use localized chat room names (#2709)
Turns out that a t_string doesn't automatically obtain the correct
translated value. Thus, I'll simply get it by calling
translation::dsgettext() directly. I also changed the translated string to
be used in the tab label as well.

(cherry-picked from commit 395eaf5251d50373d23bd8f53b7b254683a3dfed)
2018-10-07 03:24:03 +00:00
Jyrki Vesterinen
a73662c9e9 Make chat room names localizable (#2709)
(cherry-picked from commit 1eec7ef8d989357c09a5a2057095939b042e1212)
2018-10-07 03:24:03 +00:00
Steve Cotton
ad7227a318 SoF S9: Rephrase the intro text (fixes #3405) (#3437)
The original text that referred to Knalga was confusing if the
player thought of Knalga as "dwarvish territory", and most of
the campaign's scenarios have been somewhere in Knalga.

(cherry-picked from commit a6bd0c87ac9ee4066ddad2700182778a0658f4e2)
2018-10-07 03:24:03 +00:00
Jyrki Vesterinen
cdd9a902a7 Fix #3436: pot-update failing
(cherry-picked from commit 5bbc7fedca1a7ab19cfe05e3b92fb49973e29972)
2018-10-07 03:24:03 +00:00
Nils Kneuper
9ee025ccc3 updated Chinese (Traditional) translation
(cherry-picked from commit a3bb7b655fc3dadb5ce1b86fe3ae0ab7e327d94f)
2018-10-07 03:24:02 +00:00
Konrad2
34108fb31e Updated credits for @Konrad22 (#3430)
(cherry-picked from commit 37ddf43d3aaa1863eef5c1a33d41af2f6972c888)
2018-10-07 03:24:02 +00:00
josteph
49bad2c725 Addon Manager: Unabbreviate "asc" and "desc".
@jyrkive https://github.com/wesnoth/wesnoth/pull/3418#issuecomment-410433850

(cherry-picked from commit ef71d0efcbe0823d323627a13432b284e090821f)
2018-10-07 03:24:01 +00:00
josteph
f12fbb853d Addon Manager: Don't use "ascending" and "descending" to describe how dates are sorted.
(cherry-picked from commit 569e1d85a596a794096fafc65fdb7b4527ad1a5e)
2018-10-07 03:24:01 +00:00
Jyrki Vesterinen
f6eac474c3 Help: update the "Installing Add-ons" page (addresses #2703)
[ci skip]

(cherry-picked from commit fb5f46c52a6732997fc4e265536ab510d86b084f)
2018-10-07 03:24:01 +00:00
Jyrki Vesterinen
81ea32e4d4 Help: document cores (#2703)
[ci skip]

(cherry-picked from commit 40205c55fbce222701eece3168b9c5d0ba4add1c)
2018-10-07 03:24:01 +00:00
Steve Cotton
e4f280977f SoF S4: Improved the reminder to recruit miners (#3422) (fixes #3394)
Updated to [allow_undo], because the hint message shouldn't block undoing a
recall.  Recruiting can't be undone, even with [allow_undo], so this isn't
allowing a cheater's opportunity to recruit units with desired traits.

(cherry-picked from commit 66c56403db61acd1621d2b4d78e8f848c826540b)
2018-10-07 03:24:00 +00:00
Celtic Minstrel
90a87b1341 Add new contributors since 1.14.0 to the credits
Anyone who prefers to be credited some other way (or whose name I misspelled) can feel free to open another PR

@Byteron @rrigby @DisherProject @Ferk @Konrad22 @lilinitsy @UnwiseOwl @bandita137@Ordoviz

(cherry-picked from commit ff4e1b2e61ab99be12e1b36cbc954e3f66efa116)
2018-10-07 03:24:00 +00:00
rrigby
45b9fe1e5b Add categories to appdata
following https://standards.freedesktop.org/menu-spec/latest/apas02.html

(cherry-picked from commit 16e858263c86f579603d615db172aff732192ec0)
2018-10-07 03:24:00 +00:00
josteph
01867f9a2c GUI: Fix check for no usable weapons.
Fixes #3424.

(cherry-picked from commit f293c7cb3226bc7b28dbb968419ab54ff4e180da)
2018-10-07 03:24:00 +00:00
Jyrki Vesterinen
87c87aee3e Fix: halo (if any) remains when wesnoth.put_recall_unit() is used
Based on the suggested fix in #3425. Closes #3425.

(cherry-picked from commit 46bec21fa36c0ad0c2106ce25cccb6f28401abf1)
2018-10-07 03:23:59 +00:00
sigurdfdragon
d37c6d693e NR: Ensure Krash doesn't overwrite other units and is properly placed.
This could happen if a player has Krash and skipped S10a.

(cherry-picked from commit c6d2a0febc1f8ab7b9648d4319f6091c8675925a)
2018-10-07 03:23:59 +00:00
joeylmaalouf
b82647a55d NR S7-8: avoid recreating the new companions from scratch
(cherry-picked from commit 4befb3580d00ebc64709bd1e247571b193c9ae6b)
2018-10-07 03:23:59 +00:00
joeylmaalouf
f49fded31d NR S7: give Stalrag traits for consistency
(cherry-picked from commit 7c70c1d985eb5512ee32611213c326690f1ea3ec)
2018-10-07 03:23:59 +00:00
Nils Kneuper
b1f36c6483 updated Italian translation
(cherry-picked from commit 8fb7429ca81afe74494aa1f7c7b06d8e718a6c4c)
2018-10-07 03:23:58 +00:00
Nils Kneuper
a9f7ac8a19 updated French translation
(cherry-picked from commit bcce3fb4ccb7edef994e5adc30793790b727e1f4)
2018-10-07 03:23:57 +00:00
Konrad2
780dded395 SoF S01: Added snowy mountains to right map edge (#3401) (fixes #3383)
New map for SoF - Sc1 to fix #3383 (removing the fast way to reach the elvish leader, by replacing some regular mountains with snowy mountains).

(cherry-picked from commit 87eb901c105c1fdd405a1a7fddf7d81fdf545b94)
2018-10-07 03:23:57 +00:00
josteph
4b4fdb391f debug: Give feedback for :droid.
#2819

(cherry-picked from commit 55e41472130829d6b322a68c7556a126e93b70b3)
2018-10-07 03:23:57 +00:00
josteph
eaea7d0b3b debug: Fix ":droid" always toggling droid on/off even when given two arguments (":droid <side> off").
(cherry-picked from commit 0f520ad8a6638a77ec6e56eb97ef001ae3adc324)
2018-10-07 03:23:56 +00:00
gfgtdf
66c0753000 fix game crashing when showing a too large tooltip
previously the game would go into an infinite loop at
https://github.com/wesnoth/wesnoth/blob/1.14.4/src/gui/widgets/window.cpp#L1046
when a tooltip doesn't fit on screen, this could in particular happen in
the mp lobby when hovering over the 'i' of a game that uses a ridiculous
amount of modifications.

I currently don't see any case where the game is actually able to 'fix'
a bad height that was reported from reevaluate_best_size. so i just
disable reevaluate_best_size for floating tooltips.

If there exists such a case, an alternative fix could be to change the
reevaluate loop in window::layout to also stop when a new iteration
returned the same size as the previous iteration.

(cherry-picked from commit 936516c83b6e0a6e76938c65158d2d6d98f94fba)
2018-10-07 03:23:56 +00:00
gfgtdf
d3d7e8f297 improve wesnoth version warning further
(cherry-picked from commit 90fb50d70fc1a4847ea0098cb356798935b6bda8)
2018-10-07 03:23:56 +00:00
gfgtdf
4d736064e9 improve wesnoth version warning.
(cherry-picked from commit ba18e17e433bec13db77b82a5fdeaeaffa765fe4)
2018-10-07 03:23:56 +00:00
gfgtdf
cb6b7b4318 add server notifications about outdated wesnoth versions.
(cherry-picked from commit 610e4f2969cc8f0b87a537a09138d64efbbf3a2b)
2018-10-07 03:23:55 +00:00
gfgtdf
649b014770 fix skip replay being active in later scenarios
in mp campaigns.

(cherry-picked from commit f84d79e0339cbde7c80194abc5c814ae634263c2)
2018-10-07 03:23:55 +00:00
gfgtdf
b5b1065113 fix require_scenario & require_era
previously both were broken:
1) 'require_scenario' was only checked if the scenario was installed
which obviously doesn't make any sense at all.
2) 'require_scenario' was read from the local scenario data instead from
the remote scenario.
3) 'require_era' was only checked when the scenario was not installed,
so people who do have an outated version of the era installed could not
join bacause it assumed require_era=yes in that case.
4) the server tried to read 'require_scenario' from the wrong wml node,
'require_scenario' is an attribute of [scenario] and not of savefile
toplevel.

(cherry-picked from commit eec8b674de6d04f13f5b875c1b1e6b953e45ef9e)
2018-10-07 03:23:55 +00:00
gfgtdf
01816252a1 mplobby: add debug info
(cherry-picked from commit 15c59037d32e956741243cdd0d33c293ea1e72b7)
2018-10-07 03:23:55 +00:00
gfgtdf
de0a5b6ed7 don't process a corrupted gamelist_diff further
fixes #3017, assuming that the error is actually casued by the
'process_gamelist_diff failed'

As process_gamelist_diff simply returns after getting an error its quite
likeley that the gamelist is then in a  corrupted state so we stop
processing it until we get a fresh gamelist.

(cherry-picked from commit 367aec2bb2d5fc5f5acbb53842441c6190c9d452)
2018-10-07 03:23:54 +00:00
gfgtdf
80d0ab3ee8 add comment
(cherry-picked from commit edc57d2388f798b392736bcf8b6e6b75bc4d68d6)
2018-10-07 03:23:54 +00:00
gfgtdf
59a79348a6 preserve traslatable strings in simple_wml.
previously it would happen that for example an attribute like
`side_name=_"female^Footpads"` in side would get its translatable mark (_)
removed after the game has started. This meant that observers that enterd
the game after it started would see the literal string "female^Footpads"
in the status side overview window.

The new code marks all translatable simple_wml attributes to make sure their
translatable mark is preserved along with their textdomain. It can still
happen though that attributes will appear in the the wrong textdomain area
after simple_wml processing though because in some cases note::output
might skip over textdomain markers. It is still not as bad as string like
"female^Footpads" appearing in the ui though.

An alterntive appraoch to fix this issue would be to carefully make sure
not to change any atributes of wml tags that can also contain translatable
attributes, which would probably imply not editing the wml objects received
by the client at all and instead storing the new information (in particular
side information like is_local=yes/no) in a seperate wml object. (that would
then be sended to the clients along with the original scenario wml objects.)

fixes #1420

(cherry-picked from commit eb23ac56461c8d57dc5d1aee018832c2dc7dcf36)
2018-10-07 03:23:54 +00:00
gfgtdf
fabdf38a9e don't use std::pair
instead we use a custom struct. std::pair is bad becasue you never know
what "first" or "second" mean.

(cherry-picked from commit c4aacbe31f31799861e03f4b7f7b241bee64aa65)
2018-10-07 03:23:54 +00:00
gfgtdf
e3b4e1d911 fix attacks beein wrongly disabled
as said in the comment, that get_special_bool might return the wrong value, as since 5f58cd7c6d the bc_vector no longer contains disabled attacks we can just remove this code.

fixes #3324

(cherry-picked from commit 44734570dd1824a098252d78dafc0f5a561c13cf)
2018-10-07 03:23:53 +00:00
gfgtdf
7ecf55b6ed ignore [delay] during preload,prestart and initial lua.
as the ingame ui is not shown yet, [delay] would only result in showing a black screen,

Also in the case of initial lua it might result in crashes because of the threaded loadingscren, or simply because parts of the ui are not initialized yet.

(cherry-picked from commit 97b561269101e5e6d1637d00b44363fc6a1728fd)
2018-10-07 03:23:53 +00:00
Iris Morelle
768f400516 pofix: 1.14 announcement rules for 1.14.4
Also fixes a mistake from the 1.14.3 rules that caused "xxx MiB" to be
replaced with "xxx MB MiB" for all platforms. Oops. Nobody noticed
anyway (?).

[ci skip]

(cherry-picked from commit 12a3b973b9f357d0b1685df5b29fbcea0fefc7be)
2018-10-07 03:23:53 +00:00
Severin Glöckner
eeab6dc5f6 THoT S6: minor changes for difficulty and map
Uses an Orcish castle instead of destroyes human. Troll would maybe fit best,
but it doesn't fit well with the surrounding. Has now only 2 castle hexes.

On easy difficulty, reduced turns by two, it should be enought turns.
Also added one more enemy, as there are less wolves spawned on easy.
And income for Gryphons once again increased by 1, they are very expensive.

Reminding events have been adjusted to turns.

[ci skip]

(cherry-picked from commit c2064827e4d65d819ee258ec40ef54b0c8875590)
2018-10-07 03:23:52 +00:00
Severin Glöckner
22fca78978 THoT S6: Let the AI avoid the mage's hut
Until he is found. This also means one less villages for side 2, increased
their income thatfor,

[ci skip]

(cherry-picked from commit 390d66fda1f55f0b08b3ad950c7e96b38bb35994)
2018-10-07 03:23:52 +00:00
josteph
67269b00e7 THoT S6: Now that the player is told which hut to look at, don't trigger Ratheln if the player ignores the hint.
Suggested by @sevu.

(cherry-picked from commit 92bb1c263b5c42e4e4e50e77f842531d85deaec4)
2018-10-07 03:23:52 +00:00
sigurdfdragon
2dc3b198c9 Update changelog
(cherry-picked from commit c2cf0288fc3e5361e16407c5c5abcdbe2a3711a4)
2018-10-07 03:23:52 +00:00
sigurdfdragon
17011677da SotA S21: Slight touchups
Only recruit level 2 to match what nagas arrive with.

(cherry-picked from commit 46cc9a528919df08d08f6df86c3d11a4545377ed)
2018-10-07 03:23:51 +00:00
sigurdfdragon
45078c4d53 SotA S21: Fix #3294 properly
It is the Saurians that have their males killed in S11, so the females
take revenge.

(cherry-picked from commit 32a630bd3f9a7fe30a0799d7039f37db8155382a)
2018-10-07 03:23:51 +00:00
sigurdfdragon
b51cb07d2a Revert "SotA S11 & 21: Fix #3294"
This reverts commit a4bad90bad379feb77e17a4d8ab6cda1dc05e3cc.

It is supposed to be the male Saurians that get killed in S11, and the
females seek revenge in S21.

(cherry-picked from commit 7ced35839b83979b36f3d4236333667ee02d04ea)
2018-10-07 03:23:51 +00:00