72641 Commits

Author SHA1 Message Date
gfgtdf
09522ccdf8 fixup update changelog.md
(cherry-picked from commit b684c8b3aac75b986b016ce4e04ecfcc62e9bb31)
2018-10-07 03:23:41 +00:00
gfgtdf
2f7568d432 Update changelog.md
(cherry-picked from commit 4801629ab1b265028c7b05c7bf7f7cd204990c1c)
2018-10-07 03:23:41 +00:00
Jyrki Vesterinen
f245cd6285 Create a named struct for terrain name and movement pair
This allows the sorting logic top be shared between the sidebar and the
unit preview pane. It also means that we no longer need to create a lambda
to sort them.

I also refactored the generation of movement cost data in help. In
particular, we're no longer extracting the struct to named local variables.

(cherry-picked from commit d8e2498dded14e9df5abcd5e20ac8c8c252dca3a)
2018-10-07 03:23:41 +00:00
lilinitsy
a380ba8231 Sort the movement costs in the tooltip in ascending order (#3305)
Sort movement costs in tooltip, unit preview pane, and unit description alphabetically.

(cherry-picked from commit 61b7e7298b99e11746501e435e6301c7360e2d1c)
2018-10-07 03:23:41 +00:00
Jyrki Vesterinen
f05bcb7b61 Changelog: fix issue #3277 being mistyped as 3722
(cherry-picked from commit aea5d67f93f1924a4a1520e10e05c117bf892596)
2018-10-07 03:23:40 +00:00
Martin Hrubý (hrubymar10)
bcf3ba9034 Update README.md for Xcode builds
(cherry-picked from commit 097c89f916e2237bf5713c35accc932efaa96d77)
2018-10-07 03:23:40 +00:00
Iris Morelle
b62886d7a9 pofix: Rule for an http:// → https:// conversion in translatable strings
(cherry-picked from commit 74cbae01c453f4fb99876c52e15c04d9ce28fd6c)
2018-10-07 03:23:40 +00:00
Iris Morelle
1e58fc5d1a gui2/unit_recall: Fix i18n issues
The original commit adding the Rename Unit button marked two strings in
the C++ source for extraction without making them translatable.

(cherry-picked from commit bb86afcb728feef091d17a3156f1873f49fe8da7)
2018-10-07 03:23:39 +00:00
Elvish_Hunter
cb4c5301ad wmlindent: fixed crash on non-existent paths
Fixes #3346

(cherry-picked from commit af63d17e32d16fc33c39d49702bd88bcae6d0d47)
2018-10-07 03:23:39 +00:00
sigurdfdragon
cdedb38aae SotA S21: Fix #3293: Nagas stealing villages
By having the nagas be able to recruit and put the gold to use.
Fits dialog better, improves play, & makes naga leader less suicidal.

(cherry-picked from commit f6f10936614ec1f9df69229fd415f91511599255)
2018-10-07 03:23:39 +00:00
Nils Kneuper
7ac4234aab updated British English translation
(cherry-picked from commit 99cfb028d82b0520eb4feae3ae858b2a4760a058)
2018-10-07 03:23:38 +00:00
Charles Dang
510e3a801d VS: updated README
[ci skip]

(cherry-picked from commit 263ad96ad3421fe52bb836d2e179dad140c3c73a)
2018-10-07 03:23:38 +00:00
Severin Glöckner
aedd9b88b5 Macro reference: Add hint to clear variable afterwards
[ci skip]

(cherry-picked from commit 0ca460efcdad42b5bce93a420fac725cd0105993)
2018-10-07 03:23:38 +00:00
Nils Kneuper
624de09b1a updated Bulgarian translation
(cherry-picked from commit 111b5db7b435a6207132c1a3635b592c8127fd13)
2018-10-07 03:23:37 +00:00
Nils Kneuper
4b2f26b2c5 updated British English translation
(cherry-picked from commit 6295e82238e44135ba88577f9c6213cd95f04347)
2018-10-07 03:23:37 +00:00
Martin Hrubý (hrubymar10)
674fda85b7 Migrate links to https if available - Fwd c18537edc0678f40a209797d72dfaba3e5e88545
(cherry-picked from commit bc4d22dc72e79c3d6a3364ac896e473afd298246)
2018-10-07 03:23:36 +00:00
Łukasz Hryniuk
1fcf643c7d Add about.cfg entry
(cherry-picked from commit c11ac9081bf5b42b1028d381bcdf69a738e6bbb0)
2018-10-07 03:23:35 +00:00
Łukasz Hryniuk
b401d39cfa gui2: allow renaming units in the Recall dialog
(cherry-picked from commit 349b18b216c5c8c96a1bc9fd96ecc8e02cbe5a13)
2018-10-07 03:23:35 +00:00
Celtic Minstrel
39e7d69f9a Fix AI ignoring teleport locations when moving leader to leader goals
(cherry-picked from commit 45674a3d797df79813d2932094fbb7c2ca07ed2f)
2018-10-07 03:23:34 +00:00
Celtic Minstrel
5330405274 wesnoth.find_path: Allow specifying custom flags (in particular teleport) when using a custom cost function
(cherry-picked from commit 99233339dd2b3897929ed21803e9fe9792ed73c0)
2018-10-07 03:23:34 +00:00
josteph
a0c70a9b7d THoT S9: Implement a victory condition closer to the one described in the objectives.
The previous condition was, "Win as soon as Aiglondur and Angarthing
have each touched the signpost".  The new condition is, "Win as soon
as Aiglondur is on the signpost and Angarthing is next to him, or the
other way around".

[ci skip]

(cherry-picked from commit d2c8c1ae0dfc412616f9934d7ce5a2010c294b43)
2018-10-07 03:23:34 +00:00
Severin Glöckner
aa0f5d298e Tutorial S1: followup previous commits
- Removed need for quick trait by spawning quantain next to Delfador
- Disabled movement point tracking due to #3344
- Use only one [label] tag to place both labels
- Removed id's of later quintains, as they are not used
- added some whitespaces

[ci skip]

(cherry-picked from commit 74b39ef3d68bee958998cae6780080c154997a01)
2018-10-07 03:23:34 +00:00
Andras Szell
1929b1a57c Tutorial S1: prevent getting stuck next to Delfador, unable to end turn
Fixes #1584 1c - Delfador summons the puppet, you have 0 MP left but the
                 puppet is not adjacent to you, and can't attack or undo

Changed Delfador's initial position to match the quintain's, and made him
step away to summon in the original place next to us, so we don't need to
move again to attack after we reach him.
The movement points of the mage are now updated and he gained quick trait
to fit for the more movements he does.
Final movement also touched, so he does not seem to sidestep the new
enemies when leaving the map.

(cherry-picked from commit e3a95cc039c1b7d1c5f71f7de35c260438a5cbb0)
2018-10-07 03:23:33 +00:00
josteph
a351139daf WML: Support the the 'jamming' key in [unit].
This syntax is already in use in the test scenario.

(cherry-picked from commit af71bfe9c749c37326682cb31ae84bcebe54efd0)
2018-10-07 03:23:33 +00:00
Charles Dang
5f849fcbfd GUI2/Dispatcher: pass the message parameter for message events around as const
Really no reason for it to be non-const. That would imply the message's contents should
be modifiable, but that doesn't make sense.

(cherry-picked from commit 300197e9c0358e2a2df412352f8b30c457066f3c)
2018-10-07 03:23:33 +00:00
Nils Kneuper
937d302f44 updated Czech translation
(cherry-picked from commit e4da51adc319746e15970a63b4157340e0115573)
2018-10-07 03:23:32 +00:00
josteph
fe8a7aaa59 THoT S6: Highlight the hut mentioned in dialog.
[ci skip]

(cherry-picked from commit f4aa5ac66a047907894d0f1916a825aa60020775)
2018-10-07 03:23:32 +00:00
josteph
e647c87ae5 THoT S3: Marth-Tak faces east before hailing Aiglondur.
[ci skip]

(cherry-picked from commit 96fffa218259aee20935fec25ae38bb39f08979e)
2018-10-07 03:23:32 +00:00
josteph
85ec6a3149 THoT S4: Let the enemy recruit level 2 units on normal difficulty.
[ci skip]

(cherry-picked from commit fbd08b006e5bce8256288d156d7ef8fc7794b286)
2018-10-07 03:23:32 +00:00
Severin Glöckner
ad2d468542 THoT S6: improve mage appearance event
- is now less odd if the event is triggered from the map borders
- works with debug mode

[ci skip]

(cherry-picked from commit 3c57546e8932d576182570ba01c0e9e8c3f466f7)
2018-10-07 03:23:31 +00:00
sigurdfdragon
f0b6a40677 DM: Fixup 370e50c
(cherry-picked from commit d0931ae9cf2362eef8bc3fe6ad9ff7932883fa37)
2018-10-07 03:23:31 +00:00
Jyrki Vesterinen
07ff2834db Help: Hide "Lit Stone Wall" terrain (#2966)
The terrain was deprecated in commit 64493b256fcdc8cceb8a88286513534efaf93f10.
@Vultraz has said in comments of #2966 that deprecated terrains aren't
supposed to be shown in help.

Fixes #2966.

[ci skip]

(cherry-picked from commit d11d8ec8e11d0a73b92d07eacc6ba191e4703945)
2018-10-07 03:23:31 +00:00
Nils Kneuper
8e07d7a8d0 updated British English translation
(cherry-picked from commit 0a35507f3fc42e62eb07948644ca053f5dd5625f)
2018-10-07 03:23:30 +00:00
gfgtdf
568b6cc1f5 add a comment
(cherry-picked from commit 08d907e5708e8eed46471b03d41c0384e92b407e)
2018-10-07 03:23:30 +00:00
Charles Dang
071ca23a12 Language Selection: declared an execute function
(cherry-picked from commit c0b09315d1a67be30aaf82d09d06f594d0d5d2ed)
2018-10-07 03:23:30 +00:00
Charles Dang
fcfd534d90 Used the return value of modal_dialog::show instead of an explicit retval check when possible
(cherry-picked from commit 637e69f27173fb55a396eefe98a2cbbc5c662257)
2018-10-07 03:23:30 +00:00
DisherProject
2981dfd489 DM: add some TODOs
(cherry-picked from commit d5e22a32c354d135a7e1453a7f82429d4199caf4)
2018-10-07 03:23:29 +00:00
DisherProject
1e516f14fb DM S21: Add some visual effects
1) Give elves orcish bows
2) Animate the first two riders when they're spawned, so it
looks like they've been recruited

(cherry-picked from commit d0a369c65dd57d6cf45ad1ab5eb514e6378813d7)
2018-10-07 03:23:29 +00:00
DisherProject
50c457489a DM utils/sides.cfg: follow up FIXME
(cherry-picked from commit 370e50c5a67243c9584b8901c08a9fc728d97b2f)
2018-10-07 03:23:29 +00:00
DisherProject
83a6de205a DM S14: follow up TODO
(cherry-picked from commit 289af5ba1b66df897d1b04c63a9e9e9b83f87aad)
2018-10-07 03:23:28 +00:00
DisherProject
d8d00911c4 DM S08: Remove some (apparently) unused stuff
(cherry-picked from commit 4a9c6610d48c5a059cdba95afa3b7b4a31da6c94)
2018-10-07 03:23:28 +00:00
Nils Kneuper
9da2700f10 updated Japanese translation
(cherry-picked from commit fb4dbb3fcee878f427897469a26bab3536857a9c)
2018-10-07 03:23:28 +00:00
Nils Kneuper
06423777b4 updated Hungarian translation
(cherry-picked from commit 3a3bf21e3772fed706b1887fdfecc588f51cc409)
2018-10-07 03:23:27 +00:00
Charles Dang
1b4cd8195b MP Staging: move side nodes when changing teams instead of recreating them
Mp Join Game will require further refactoring; it recreates the entire tree when receiving data...

(cherry-picked from commit ae7d05e8fc8618aa247aae04b3a03431f7b0f0a7)
2018-10-07 03:23:27 +00:00
josteph
2ea002b112 Backport tree_view_node::ptr_t from master
Said typename was added to master in commit "GUI2: made widget
initialization process more secure against memory leaks"
(3d894faf11bba1b214914a7af565f4c712e29a5a). It is required on this
'remaster' branch by commit "GUI2/Tree View: added interface for moving
nodes between parent nodes" (fa7c967c0a3645734d93d56c1ade8ca394d20846
on master, e247892616aca160fea8df5d34fcca52c891baf2 on 1.14).

(cherry-picked from commit 0f511e8e55ac873d632366adc669266d8e5d5faf)
2018-10-07 03:23:27 +00:00
Charles Dang
766a0ffead GUI2/Tree View: added interface for moving nodes between parent nodes
(cherry-picked from commit fa7c967c0a3645734d93d56c1ade8ca394d20846)
2018-10-07 03:23:27 +00:00
Charles Dang
97e05cac7e Synced 1.14.3+dev changelog section with the 1.14 branch
[ci skip]

(cherry-picked from commit d5972c6f43e7cf8da54f02083b11b1d35451b509)
2018-10-07 03:23:26 +00:00
Charles Dang
7451421db7 Reapply d0100758f855ec0d8f30dff41e8a8b6ff2d45fda
(cherry-picked from commit 8fcd3f2a833682a95c7d175d6a48cc42fa5e0c2d)
2018-10-07 03:23:26 +00:00
Charles Dang
aba5b94b99 Upgrade to Lua 5.3.5
(cherry-picked from commit 264389807c1cb789a3cfc3c386da049becdfbe67)
2018-10-07 03:23:26 +00:00
Charles Dang
39ff3e9114 Remove reference to players_changelog
(cherry-picked from commit 5bb72d7c8987ba4bb3ff734efe54d9c33c0d19b5)
2018-10-07 03:23:25 +00:00