[wesnoth-commits] [wesnoth/wesnoth] 789c5c: Use a fallback for when the player name is not kno...
GitHub
noreply at github.com
Tue Oct 30 00:27:26 UTC 2018
Branch: refs/heads/master
Home: https://github.com/wesnoth/wesnoth
Commit: 789c5cd3ac4c874ec924ee9a2088eba7723f7065
https://github.com/wesnoth/wesnoth/commit/789c5cd3ac4c874ec924ee9a2088eba7723f7065
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/synced_commands.cpp
Log Message:
-----------
Use a fallback for when the player name is not known in debug notifications
We just found out that it is possible for the player name to not be set
when loading a singleplayer start-of-scenario save for the first time
right after launching Wesnoth. It's best to have an actual $player value
for that case instead of spurting 100% syntactically invalid statements
like "The :lua command was used during 's turn" because of the empty
variable.
(cherry picked from commit 8b41d4d8fc4408084abff62a4e7d63eeb1c10bd1)
Commit: d926c213527ee821b4444cc604019fa7f0fcc52d
https://github.com/wesnoth/wesnoth/commit/d926c213527ee821b4444cc604019fa7f0fcc52d
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/playturn.cpp
Log Message:
-----------
fix gui2 dialog disappearing after [change_controller]
fixes #2794
(cherry picked from commit 0d2870394f2b11917e9f116653ff3130dc8e296e)
Commit: 94a9dbe9272a403f9e6e960dff8ee08581f60e39
https://github.com/wesnoth/wesnoth/commit/94a9dbe9272a403f9e6e960dff8ee08581f60e39
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/playturn.cpp
Log Message:
-----------
less redraw_everything calls when receiving [change_controller]
we now only call redraw_everything() when the gui actually needs
updating. In particular this fixes an annoing flickering in some cases
where a gui2 dialog is shown while a [change_controller] is received.
(cherry picked from commit 247e08e1d521cfca3279c679f93dd0248ef23832)
Commit: 05ad78335d7511526c5c3ad80c7f8d93c5c4d428
https://github.com/wesnoth/wesnoth/commit/05ad78335d7511526c5c3ad80c7f8d93c5c4d428
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/core/help.cfg
Log Message:
-----------
Help: removed sort_sections key with invalid value
[ci skip]
At no point is "generated" checked for as value of that key (the only valid value is "yes").
"generated" is a valid value for sort_topics, however. As for whether we want sorting or not
for Eras, I don't think so. The era order as displayed seems logical enough since it groups
each era and Age of Heroes variant together.
(cherry picked from commit 6b20ccdb6282084b1fdb446d8a93d621204e8408)
Commit: 0bc9f4ef237fcd718b104ffa93351fffeb3d8de0
https://github.com/wesnoth/wesnoth/commit/0bc9f4ef237fcd718b104ffa93351fffeb3d8de0
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/themes/default.cfg
Log Message:
-----------
Fix HP label in longer languages
English uses 2 letter abbrev but some languages like Czech don't have this abbrev so we need wider space for our 6 letter label "Životů"
(cherry picked from commit d51ccbe5386e5325c6ecfe6c46472f7a8113bfa7)
Commit: c6595d6f8442ed487699f5afbb709807dcbabce9
https://github.com/wesnoth/wesnoth/commit/c6595d6f8442ed487699f5afbb709807dcbabce9
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Pofix entry for ab9f29a7a44372a3e3703fd842740a9b425b6f5f
[ci skip]
(cherry picked from commit 697216e8ea1c29887a59d3e761d28c1be24ea616)
Commit: 6ef8599f0b2f141015578ed13fb27fba57ebd414
https://github.com/wesnoth/wesnoth/commit/6ef8599f0b2f141015578ed13fb27fba57ebd414
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Pofix entry for b86a2968fe87a7e4112e900070446d4a83808202
[ci skip]
(cherry picked from commit 9f6b66c7383f2dec849adc42acf943675428efa8)
Commit: 6ecca66c23967df6a9396ec657b9bd7721288af7
https://github.com/wesnoth/wesnoth/commit/6ecca66c23967df6a9396ec657b9bd7721288af7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Pofix entry for fc6c3ac04b899b4c7f629a1cd8d80101c7cbb20c
[ci skip]
(cherry picked from commit f64f51c10e7f7e45cae647111a27e61bb32626bd)
Commit: 9e999a996a16497c32de371ab8c89dfb3840a209
https://github.com/wesnoth/wesnoth/commit/9e999a996a16497c32de371ab8c89dfb3840a209
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for recent SotA fixes
[ci skip]
(cherry picked from commit a8e33031c030383ab01b12a423155e7961847460)
Commit: 63d0aa335659dc68a80fd3a668eb439dd566847b
https://github.com/wesnoth/wesnoth/commit/63d0aa335659dc68a80fd3a668eb439dd566847b
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Fix pofix
Two of these strings were not a fix, just a removed string, so no need for pofix.
The other was not specific enough for pofix to match unambiguously.
Also, someone forgot a comma somewhere, causing a syntax error.
(cherry picked from commit 4331c7f4e90dc62a6ea0551abbe971261e7526e7)
Commit: 6150db6b1a835cfa930e7324468bc24b087de53b
https://github.com/wesnoth/wesnoth/commit/6150db6b1a835cfa930e7324468bc24b087de53b
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
Log Message:
-----------
LoW: Fix translation error in conjunct list (fixes #2833) (#2834)
(cherry picked from commit c086f0c47ff4efa22a09e0ef6383ff8a6093ce0b)
Commit: 6f080fd61d039a2ca5fd349785803cb51a6c56e9
https://github.com/wesnoth/wesnoth/commit/6f080fd61d039a2ca5fd349785803cb51a6c56e9
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/help/help.cpp
Log Message:
-----------
Help: disabled parsing error popup
See issue #2587 and 5517063fb9cb1673b0a148e11a6eb50dbc00086d for more details.
Should fix #2874.
(cherry picked from commit f7ab008c593aa00029147bd86556dcebdc28a719)
Commit: ea8c86563cbf88a5b6d9bad5b9dc6ca10f0db7b5
https://github.com/wesnoth/wesnoth/commit/ea8c86563cbf88a5b6d9bad5b9dc6ca10f0db7b5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/help/help.cpp
Log Message:
-----------
Fixup f7ab008 before GCC complains about an unused parameter >_<
(cherry picked from commit 2aff2cd36f86113afa383ff45c7005cdbc7b1022)
Commit: b9f26a43646be6ae36452254e2294b5d5ad8525b
https://github.com/wesnoth/wesnoth/commit/b9f26a43646be6ae36452254e2294b5d5ad8525b
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/ai/default/recruitment.cpp
M src/ai/default/recruitment.hpp
Log Message:
-----------
AI recruitment: fix units on recall list interfering with recruiting
Units on the recall list are treated as recruits by the AI. The code
previously did not check whether a unit it worth being recalled until
after it makes the decision which unit type to recruit/recall. If it
then can only recall, but not recruit units of that type and all of
them are deemed not worth it, the entire recruitment CA is disabled
(via black listing), meaning recruiting is abandoned also.
This commit fixes this by checking the unit value vs. the recall cost
before putting recalls on the recruitment list.
(cherry picked from commit 1597a2ce273e2f6f89221fc9fa10590892f43043)
Commit: d1ba9a33a387a14ae06008c781e2af54d546366e
https://github.com/wesnoth/wesnoth/commit/d1ba9a33a387a14ae06008c781e2af54d546366e
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/ai/default/recruitment.cpp
Log Message:
-----------
AI recruitment: use unit-specific recall cost
… when deciding whether a recall is worth it.
(cherry picked from commit 0119413910591aa9e8ced71c9702271df51b67c4)
Commit: 947cae0cddaa9b8c1394fa6fdeb21a7540e55802
https://github.com/wesnoth/wesnoth/commit/947cae0cddaa9b8c1394fa6fdeb21a7540e55802
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
Log Message:
-----------
Revert string changes in SotA for 1.14 RC 3 - gold
This reverts the following commits:
* "SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)" - commit ab9f29a7a44372a3e3703fd842740a9b425b6f5f
* "SotA S8: fixed inconsistent Ghost name (fixes #2846)" - commit fc6c3ac04b899b4c7f629a1cd8d80101c7cbb20c
(cherry picked from commit f843a0eebe56b3cd41ed76e184af9e1419525578)
Commit: ec849c97da9036ad514cf6650c19f61f7b1cabb5
https://github.com/wesnoth/wesnoth/commit/ec849c97da9036ad514cf6650c19f61f7b1cabb5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/gui/window/statistics_dialog.cfg
Log Message:
-----------
Swap count and name columns in statistics (fixes #2893)
(cherry picked from commit 42ee12621b95c022b3677331abbcf6d23e54e810)
Commit: 2f031cd81036f9ad621d459a87b20403cf46e649
https://github.com/wesnoth/wesnoth/commit/2f031cd81036f9ad621d459a87b20403cf46e649
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/_main.cfg
Log Message:
-----------
UtBS: Re-added compatibility code to load old saves using the new elves
(cherry picked from commit a565e9259faa84d8d96b5aed0ab40f299e714f7c)
Commit: b7fe28c03ef368cc77e82bbb3c6f715e9d2b3064
https://github.com/wesnoth/wesnoth/commit/b7fe28c03ef368cc77e82bbb3c6f715e9d2b3064
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/scripting/lua_unit.cpp
Log Message:
-----------
Fixup 601c67d970c2eac
Turns out that commit broke TC on unit images in messages since it broke the equality
check in lua_unit.cpp. Added the XBRZ IPF as part of the Lua unit portrait attribute
instead.
I *think* this is the proper place to do it.
(cherry picked from commit fab229b5e85e0b1c00d7f5223c3b2241cf6ba61c)
Commit: c79ba9ac034ababc6e952469b341470dace5d2d4
https://github.com/wesnoth/wesnoth/commit/c79ba9ac034ababc6e952469b341470dace5d2d4
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/themes/default.cfg
Log Message:
-----------
Fix MP label for #2855
(cherry picked from commit 4ba1811f03bfd6b9706a281e05c316be86cbe97c)
Commit: 3ac0deb56f6ef5b01083b42ca270b7d1c65d1700
https://github.com/wesnoth/wesnoth/commit/3ac0deb56f6ef5b01083b42ca270b7d1c65d1700
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/_main.cfg
Log Message:
-----------
UtBS: wmlindent pass
[ci skip]
(cherry picked from commit 0e96a281420c7f7616ffe0d1c9357fbd853b741b)
Commit: f185006f72b1a6da2c90a9d960731ce2c22fc08e
https://github.com/wesnoth/wesnoth/commit/f185006f72b1a6da2c90a9d960731ce2c22fc08e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg
Log Message:
-----------
UtBS: readd do_not_list
The unit database may rely on this
[ci skip]
(cherry picked from commit 864d8677f207ded5f4347942e1e95afcf59bc555)
Commit: e58098609d807fd8fa3fd31422e7a7aab1885807
https://github.com/wesnoth/wesnoth/commit/e58098609d807fd8fa3fd31422e7a7aab1885807
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/core/help.cfg
Log Message:
-----------
Hide Editor help section
See isssue #2964.
[ci skip]
(cherry picked from commit 722637c59ab6df18c8c1ec5176983fd6d5dc7817)
Commit: e46f0a5167f79c5bf7e19d90d98f694a71e25fe4
https://github.com/wesnoth/wesnoth/commit/e46f0a5167f79c5bf7e19d90d98f694a71e25fe4
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M packaging/wesnoth.appdata.xml
Log Message:
-----------
add placeholer links to appdata file
(cherry picked from commit 8044bb512eb3cb1bcc992fc17263f0175a5d828f)
Commit: 41c5d0cedd5a9c868d15b4614d204bd4fba7a6d2
https://github.com/wesnoth/wesnoth/commit/41c5d0cedd5a9c868d15b4614d204bd4fba7a6d2
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M projectfiles/Xcode/Resources/SDLMain.nib/designable.nib
M projectfiles/Xcode/Resources/SDLMain.nib/keyedobjects.nib
Log Message:
-----------
Add changelog for 1.14.0
(cherry picked from commit ff26057382502b05dbb638518b54b6f438542a50)
Commit: 95b4d4e0d78c26df666415096995a61b033da020
https://github.com/wesnoth/wesnoth/commit/95b4d4e0d78c26df666415096995a61b033da020
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/gui/macros/_initial.cfg
Log Message:
-----------
Repair 66ab35f in the upwards direction
[ci skip]
(cherry picked from commit d724b1a71d67ffd45ad58654d3bd3a7fafdb6694)
Commit: 8b611fe403a030d44e29277a1254241e8d03af2c
https://github.com/wesnoth/wesnoth/commit/8b611fe403a030d44e29277a1254241e8d03af2c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M RELEASE_NOTES
Log Message:
-----------
Clear RELEASE_NOTES
[ci skip]
(cherry picked from commit 43f30cdd613035fcea0432a01f721e0450d3106c)
Commit: 3c4de1b01fc262b6f49655fbc02480b39a69afd7
https://github.com/wesnoth/wesnoth/commit/3c4de1b01fc262b6f49655fbc02480b39a69afd7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
Log Message:
-----------
Re-apply patches to fix issues #2844 and #2846 in SotA
This restores the changes from the following commits:
* "SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)" - commit ab9f29a7a44372a3e3703fd842740a9b425b6f5f
* "SotA S8: fixed inconsistent Ghost name (fixes #2846)" - commit fc6c3ac04b899b4c7f629a1cd8d80101c7cbb20c
(cherry picked from commit 97cc0f8afb2513370055db84eb725a68eb156c83)
Commit: 75cbcd8d3c3e9985e61fd367a550d5aba578ed6d
https://github.com/wesnoth/wesnoth/commit/75cbcd8d3c3e9985e61fd367a550d5aba578ed6d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
Log Message:
-----------
TRoW: revert changes, to avoid a potential OOS
[ci skip]
(cherry picked from commit 0bd286e46e7a0da20a9c714e99b78883042efbd6)
Commit: 120db41f8f1fc2b8861ddc5938a303615d470f53
https://github.com/wesnoth/wesnoth/commit/120db41f8f1fc2b8861ddc5938a303615d470f53
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog for custom AI for AToTB S2
(cherry picked from commit 15a749994c40ef103240aa5d02a8b3ab83bf72e6)
Commit: 4173d4ef7cba99ffe95458123eecd2973a8fda59
https://github.com/wesnoth/wesnoth/commit/4173d4ef7cba99ffe95458123eecd2973a8fda59
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M RELEASE_NOTES
Log Message:
-----------
Update RELEASE_NOTES
(cherry picked from commit e2a2a85f16fb5984ad0e44b0ec3f16a5eb1ac823)
Commit: 1489f5fbd090f516e1b87873cd84438bd80fc034
https://github.com/wesnoth/wesnoth/commit/1489f5fbd090f516e1b87873cd84438bd80fc034
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/themes/classic.cfg
Log Message:
-----------
Minor tweaks to classic theme (thanks enclave for doing this)
No forward-port to master, as the classic theme will be removed in 1.15.0
(cherry picked from commit bf3ece140e5ffc22ca5d1ffd8316ecac93ad5d93)
Commit: 2252896899df47e602ddcefc846c45657ac95797
https://github.com/wesnoth/wesnoth/commit/2252896899df47e602ddcefc846c45657ac95797
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/display_chat_manager.cpp
Log Message:
-----------
Increased in-game chat size. This makes it render more smoothly
Thanks to @ProditorMagnus for the suggestion.
(cherry picked from commit b1aa101009ae176c1dd01e819c11c20eae33289a)
Commit: 5e8a4ca8840ed521a41cf853b9b66fbb9115b410
https://github.com/wesnoth/wesnoth/commit/5e8a4ca8840ed521a41cf853b9b66fbb9115b410
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
wesnothd: prevent another instance of crash from owner not in player_connections
(cherry picked from commit 3ed366582d8bf8a3888377f883a8dbd4ad22ddcc)
Commit: bb47f9f64695d00b3f7595a855966013e265eac4
https://github.com/wesnoth/wesnoth/commit/bb47f9f64695d00b3f7595a855966013e265eac4
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
changelog: remove AToTB AI entry
(cherry picked from commit 2f960ec3e789174393d17ab90fedb1386d3754e5)
Commit: 6449067a8adcbf7566f78b014e01b934b8ee0175
https://github.com/wesnoth/wesnoth/commit/6449067a8adcbf7566f78b014e01b934b8ee0175
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
Northern Rebirth S02_01: keep side 8 leader from wandering off too far
If he ends up on the tiny keep in the south, he can only recruit one
unit per turn, which affects the intended balance of the scenario.
Fixes #3073
(cherry picked from commit 42bcf049c1627275027dc04c4467b431a6b7efd2)
Commit: bd2bf467a3d6b21251cfbd6e05820402d0e359dd
https://github.com/wesnoth/wesnoth/commit/bd2bf467a3d6b21251cfbd6e05820402d0e359dd
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/core/macros/deprecated-utils.cfg
Log Message:
-----------
Add missing deprecation messages for deprecated macros
This also bumps ON_SIGHTING to level 2.
(cherry picked from commit f550f2d6f54778ae44560b3e1e2602064d63a9de)
Commit: cf91d99881c067096e1cc0eed1b60bf480d92d17
https://github.com/wesnoth/wesnoth/commit/cf91d99881c067096e1cc0eed1b60bf480d92d17
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
Log Message:
-----------
TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912
Height of 600 seems to work fine, and is the same as in the core Ancient Wose portrait.
(cherry picked from commit e41cd0b27f97ddaadf5bc471abf1a7a9e352debf)
Commit: 1b7589a1422291427c6b8a9167610c4ce6215607
https://github.com/wesnoth/wesnoth/commit/1b7589a1422291427c6b8a9167610c4ce6215607
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
Log Message:
-----------
TRoW: Increase Rithrandil's workaround portrait height to 700
[ci skip]
(cherry picked from commit 4d92cc2395e45e84f34b93b86015c2400cff40ce)
Commit: ea0b609464a5eaada0ecc10c646a400e8f34dcdb
https://github.com/wesnoth/wesnoth/commit/ea0b609464a5eaada0ecc10c646a400e8f34dcdb
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for the #2912 work around
[ci skip]
(cherry picked from commit 1b04b9da4d049fddd6a23a1bd9f80fa02537ed5e)
Commit: 88c65fa8926d6776bbbede3b1aaafd76b501b0cd
https://github.com/wesnoth/wesnoth/commit/88c65fa8926d6776bbbede3b1aaafd76b501b0cd
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
Log Message:
-----------
TRoW: revert workaround for #2912
[ci skip]
Reverts e41cd0b, 4d92cc2, and 1b04b9d.
(cherry picked from commit 489fbccba15fafe2c1a4a3b22ec2c2007bddcdfe)
Commit: ff92667ffd2c0c99c634f55889f20a2dbf158a87
https://github.com/wesnoth/wesnoth/commit/ff92667ffd2c0c99c634f55889f20a2dbf158a87
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/12_Walking_Trees.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/13_Together_Again.cfg
M data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
Log Message:
-----------
SotA: transform bats already after the 5th scenario
and keep compatibility code to transform older saves
[ci_skip]
(cherry picked from commit cf3d6bf97a6fbe97b96858ee742011480bffc94b)
Commit: 946fd52cec3038188d3e833a4e0f4a01acdf30d5
https://github.com/wesnoth/wesnoth/commit/946fd52cec3038188d3e833a4e0f4a01acdf30d5
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M projectfiles/Xcode/Resources/SDLMain.nib/designable.nib
M projectfiles/Xcode/Resources/SDLMain.nib/keyedobjects.nib
Log Message:
-----------
Update changelog in macOS package
(cherry picked from commit 493c4acfdde0b8dbf11934d9f1b01148d73d1891)
Commit: 5e36b2b98b7311dcea00ff46af5e7b2af8d52d05
https://github.com/wesnoth/wesnoth/commit/5e36b2b98b7311dcea00ff46af5e7b2af8d52d05
Author: Thom Diment <mr.diment at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
Log Message:
-----------
UtBS 5: changes to scenario locations (#3104)
* UtBS 5: changes to scenario locations
>From #3077:
* Moved AI leader spawns to keeps
* Changed spawn of trolls that were spawning in walls
* Sanity-checked village ownership in cavern
>From #3078:
* Changed spawn of Eastern Troll Flamecaster
* Fixed entry routes of Troll Flamecasters
>From author notes:
* Made 'Wounded Dwarf' a wounded unit
(cherry picked from commit bf28cc7d762ec6708f3e3d5e6077958dec5ae1b9)
Commit: cd6acf758a9cbc0add23f38501d856726414d861
https://github.com/wesnoth/wesnoth/commit/cd6acf758a9cbc0add23f38501d856726414d861
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
Log Message:
-----------
Tutorial Part2: Give the player a canche to undo his move
in case he started an attack from the water. The warning
makes no sense otherwise.
[ci skip]
(cherry picked from commit 9cac36e6b858cc9344674f5c90aa872e12e5ba9d)
Commit: c260cd25298968cf362f019f2394b5a9cb49551d
https://github.com/wesnoth/wesnoth/commit/c260cd25298968cf362f019f2394b5a9cb49551d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
M data/core/units/undead/Corpse_Soulless.cfg
M data/core/units/undead/Corpse_Walking.cfg
Log Message:
-----------
add / remove some comments
[ci skip]
(cherry picked from commit df8ac3cbb0be62929d654108bfb28ae36c0b41ad)
Commit: 3c3ef6ced600809af4953f212dfd3d9b761467eb
https://github.com/wesnoth/wesnoth/commit/3c3ef6ced600809af4953f212dfd3d9b761467eb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/gui/window/statistics_dialog.cfg
Log Message:
-----------
Statistics Dialog: merge unit name and count labels
Makes it easier for translators to do something specific with this label if needs
be. I remember the reason the count (NUMx) label was moved prior to the name had
to do with language conventions too, so this should alleviate any other such issues.
Also made the name label default size instead of small.
(cherry picked from commit e9f7952408f1af9b6b210c1466242fd2784513f9)
Commit: ba0e6c14d1ea84b52f0c0a733f528f4a494ee7b6
https://github.com/wesnoth/wesnoth/commit/ba0e6c14d1ea84b52f0c0a733f528f4a494ee7b6
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M po/wesnoth-tsg/de.po
Log Message:
-----------
German translation: fix a string
[ci skip]
(cherry picked from commit e9076bde9669d7b029034a5a5b0ee244b0f69a22)
Commit: 6d598ed6259002eb998c57cc014d55fbaec17ce4
https://github.com/wesnoth/wesnoth/commit/6d598ed6259002eb998c57cc014d55fbaec17ce4
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M po/wesnoth-multiplayer/de.po
Log Message:
-----------
German translation: reword era descriptions
[ci skip]
(cherry picked from commit a1a73ebf1a8e454ea563d4bc4386285563839569)
Commit: cbaf62165b5d414863a418ee8d8c69cb2cb0907a
https://github.com/wesnoth/wesnoth/commit/cbaf62165b5d414863a418ee8d8c69cb2cb0907a
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M po/wesnoth-multiplayer/de.po
Log Message:
-----------
German multiplayer translation: fixes
[ci skip]
(cherry picked from commit 8df83da3109a93afc91a2bfafd49b640823171ee)
Commit: f4f7086d9f0d63702dbd4bc31c62c830b0ed084a
https://github.com/wesnoth/wesnoth/commit/f4f7086d9f0d63702dbd4bc31c62c830b0ed084a
Author: Victor Sergienko <singalen at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M .gitignore
Log Message:
-----------
.gitignore for CLion
(cherry picked from commit 9ec8589ef3113f6e7ba62cd21cad1b3323277821)
Commit: e88d56c036455c6dcfd2eeb8d8f5fceb6c135123
https://github.com/wesnoth/wesnoth/commit/e88d56c036455c6dcfd2eeb8d8f5fceb6c135123
Author: Victor Sergienko <singalen at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/filesystem.cpp
Log Message:
-----------
iOS document directories. Might use these on other platforms as well.
(cherry picked from commit 0238d1529f3b13874488306c55ec3e6b162c705d)
Commit: 046fbc5dfad52bb82fb353f3acb3cc85937da093
https://github.com/wesnoth/wesnoth/commit/046fbc5dfad52bb82fb353f3acb3cc85937da093
Author: Victor Sergienko <singalen at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/gui/core/event/distributor.cpp
M src/gui/core/event/distributor.hpp
M src/gui/widgets/scrollbar.cpp
M src/gui/widgets/scrollbar.hpp
M src/gui/widgets/scrollbar_container.cpp
M src/gui/widgets/scrollbar_container.hpp
M src/widgets/scrollarea.cpp
M src/widgets/scrollarea.hpp
Log Message:
-----------
iOS: finger scrolling in controls.
(cherry picked from commit ccb5ccdaf74fa51822a54ba6af6b177c6f6fc38e)
Commit: 97ba61da4b44475c14d223f2db0e9c507f166dcc
https://github.com/wesnoth/wesnoth/commit/97ba61da4b44475c14d223f2db0e9c507f166dcc
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
Log Message:
-----------
DM: add some TODOs
(cherry picked from commit ae088f4ce29449c5f51b041ced4e9a6e753f18a7)
Commit: 119d5f3412fe63bbf1f761f1cbd176a07d84024d
https://github.com/wesnoth/wesnoth/commit/119d5f3412fe63bbf1f761f1cbd176a07d84024d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/gui/window/unit_recall.cfg
Log Message:
-----------
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.
Additionally, a string in the markup violates the string freeze. This
can be papered over by reusing the existing "Rename Unit" string. For
1.14.5 we'll use just "Rename" again.
(cherry picked from commit 306ebb9a87dc6258d7da9ce5e9e4b66ed32ffef9)
Commit: 53be0fef39242321bc23e218b3b90f78dbfe7c36
https://github.com/wesnoth/wesnoth/commit/53be0fef39242321bc23e218b3b90f78dbfe7c36
Author: Toom <public.ravana at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
A data/test/scenarios/swarm_disables_upgrades.cfg
M wml_test_schedule
Log Message:
-----------
Add WML unit test for unupgradable (#3336)
* Add WML unit test for unupgradable
* Follow [do_command] requirements
(cherry picked from commit 739df85e1d0e7f382bc5c5664d29c36204ba8d0f)
Commit: e044ea750dfdf22f0e7175c9f7781d98522592cb
https://github.com/wesnoth/wesnoth/commit/e044ea750dfdf22f0e7175c9f7781d98522592cb
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M projectfiles/Xcode/Resources/SDLMain.nib/designable.nib
M projectfiles/Xcode/Resources/SDLMain.nib/keyedobjects.nib
Log Message:
-----------
Updated changelog in Xcode
(cherry picked from commit 87332aa8b0990536dc5a8cc9956e539c07b1ddff)
Commit: f62758ee2de77edd8add076a57b0e234b8d4ff83
https://github.com/wesnoth/wesnoth/commit/f62758ee2de77edd8add076a57b0e234b8d4ff83
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/gui/window/unit_recall.cfg
Log Message:
-----------
gui2/unit_recall: Change Recall button back to its correct label
Closes #3361.
(cherry picked from commit 1e449a193a3ab46ec529a1851610b39fdc4e251d)
Commit: e1e57ed033a3f60853ab557ec84648b855b57384
https://github.com/wesnoth/wesnoth/commit/e1e57ed033a3f60853ab557ec84648b855b57384
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
Log Message:
-----------
DM: Generalize death message so it works when Delfador is young and old
(cherry picked from commit 791c4be2fd7a103fe798afb960b5149fde6e1926)
Commit: 30a3af75c32b32b0828c8faf6d5d2c50943d0c15
https://github.com/wesnoth/wesnoth/commit/30a3af75c32b32b0828c8faf6d5d2c50943d0c15
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
Log Message:
-----------
DM: Add last breath dialog for Zorlan
(cherry picked from commit c39be1e9dba7c51f4e726ca8cd272fe223dbc7a7)
Commit: 33c155e80213eb87323cbb5ed0f28e3cdfd59f68
https://github.com/wesnoth/wesnoth/commit/33c155e80213eb87323cbb5ed0f28e3cdfd59f68
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
R data/core/images/terrain/village/hut-snow-night.png
R data/core/images/terrain/village/hut-snow2-night.png
R data/core/images/terrain/village/hut-snow3-night.png
R data/core/images/terrain/village/hut-snow3.png
R data/core/images/terrain/village/hut-snow4-night.png
R data/core/images/terrain/village/hut-snow4.png
M data/core/terrain-graphics.cfg
Log Message:
-----------
Partially revert "Additional village variations (#3342)"
The new images weren't supposed to go into 1.14, but the updates to the existing two hut images can remain.
This partially reverts commit a55e5228b2ea0248cee7cd78ee35d26cb407536e.
(cherry picked from commit 556d9ffb91cdf0376336366c1176009169dd6d5b)
Commit: 6f999d3d0722c9f1585afdad449c1c0b0e03fff2
https://github.com/wesnoth/wesnoth/commit/6f999d3d0722c9f1585afdad449c1c0b0e03fff2
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
Log Message:
-----------
NR S8: compatibility commit to make the new companions from scratch if we don't have them stored
(cherry picked from commit b706d8ba5ee246d0355fbe699da4ee5c3be3a926)
Commit: 2094c0440e3eb78e700b57b5aa248905b80087bb
https://github.com/wesnoth/wesnoth/commit/2094c0440e3eb78e700b57b5aa248905b80087bb
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Fix CMake build on macOS
Thanks @Pentarctagon
(cherry picked from commit 900555c84512e519c0df70735d43e61ff39cad12)
Commit: b5be41506b7b05fd0cf48d37815c6517e6b1a280
https://github.com/wesnoth/wesnoth/commit/b5be41506b7b05fd0cf48d37815c6517e6b1a280
Author: josteph <josteph at fastmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/save_index.cpp
Log Message:
-----------
Game Load: Restore the ability to select 1.12.6 savegames in the list
Broken in 14abecb2df9f94b4a4438156f9808596d223864b (#3495)
(cherry picked from commit 1497dc5fea578976fb98310e06071789a9ec91f5)
Commit: 9e0593d7143fa76c51239b5cb874284d1800e1fc
https://github.com/wesnoth/wesnoth/commit/9e0593d7143fa76c51239b5cb874284d1800e1fc
Author: josteph <josteph at fastmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M data/themes/default.cfg
Log Message:
-----------
Themes: Fix the observers icon being hidden under the minimap
Closes #3543. Fixups #3441.
The observers icon is declared immediately after `report_timeout`,
therefore the timeout widget was the ref rect for the observers widget:
https://github.com/wesnoth/wesnoth/blob/83ba09a5a98b817a3e50a89dd6b41d2f779af5ff/src/theme.cpp#L120
PR #3441 added a battery icon to the left of the timeout widget. That
shifted the timeout widget to the right and the observers widget shifted
along with it due to its relative positioning. The observers widget
moved even on devices that didn't have a battery.
Fix this by using the battery box as the ref of the observers widget,
because it currently occupies the absolute location the observers widget
was positioned relatively to.
(cherry picked from commit 461cd2c4bdeb2eb0e84ede6e57cd0b315dee2cee)
Commit: 3cb1654b72f79ac153e785cc9f15397008a0c099
https://github.com/wesnoth/wesnoth/commit/3cb1654b72f79ac153e785cc9f15397008a0c099
Author: josteph <josteph at fastmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/save_index.cpp
Log Message:
-----------
Game Load: Use child_or_empty().
Requested by @jyrkive.
(cherry picked from commit adc5d4a71a9648281918d852782d20639dc89c42)
Commit: 3a80addf1e9415c4c3242d06e84cc5f3c7e515dd
https://github.com/wesnoth/wesnoth/commit/3a80addf1e9415c4c3242d06e84cc5f3c7e515dd
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/desktop/apple_version.mm
Log Message:
-----------
Implement iOS version detection
(cherry picked from commit 8b43b6716d981664a0e97b24bed33fb638eca38d)
Commit: 860c4d7255c325a6649c7e9a80b7dfc0f9970c69
https://github.com/wesnoth/wesnoth/commit/860c4d7255c325a6649c7e9a80b7dfc0f9970c69
Author: josteph <josteph at fastmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/gui/core/event/message.hpp
Log Message:
-----------
Fix includes
(cherry picked from commit 8f8ec38dfc40b0dc447b3aedba5427e7d828b76b)
Commit: cd7052a4cbbd54d3f3a523a154fb70ad15d17131
https://github.com/wesnoth/wesnoth/commit/cd7052a4cbbd54d3f3a523a154fb70ad15d17131
Author: josteph <josteph at fastmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/scripting/lua_gui2.cpp
Log Message:
-----------
Lua: Invalidate layout in set_dialog_value()
Needed when the new value is longer than the old one.
Fixes #3572.
(cherry picked from commit 8000a868286d374d39c71215de6f376a31e4fe0a)
Commit: 8e2d8fcd4ab09975d488993d353d946273c6731e
https://github.com/wesnoth/wesnoth/commit/8e2d8fcd4ab09975d488993d353d946273c6731e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/formula/function.cpp
Log Message:
-----------
fix out of bonunds check
(cherry picked from commit ea611b52d756d4400b07fcdfc100799247883612)
Commit: 9496ae4b4d6e06c24b23a93f4c89f53c9e81661d
https://github.com/wesnoth/wesnoth/commit/9496ae4b4d6e06c24b23a93f4c89f53c9e81661d
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
don't show travis notifications from forks
(cherry picked from commit d6ab780ce94df14a6eb1eeb4df7ce2543fc27069)
Commit: d22d6ea7b8d784cd79ddbb224cb10592c72132bf
https://github.com/wesnoth/wesnoth/commit/d22d6ea7b8d784cd79ddbb224cb10592c72132bf
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
fixup don't show travis notifications from forks
(cherry picked from commit 55bc62f442da47f0b754ed9b75238c5a53fd76dd)
Commit: 00a1edd1499ee16c6936015439d9fdace18204ff
https://github.com/wesnoth/wesnoth/commit/00a1edd1499ee16c6936015439d9fdace18204ff
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/actions/move.cpp
M src/ai/simulated_actions.cpp
M src/build_info.cpp
M src/generators/default_map_generator_job.cpp
M src/gui/dialogs/drop_down_menu.cpp
M src/gui/dialogs/editor/generate_map.cpp
M src/gui/dialogs/file_dialog.cpp
M src/image_modifications.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_gui2.cpp
M src/sdl/utils.cpp
M src/soundsource.cpp
M src/units/unit.cpp
Log Message:
-----------
Convert a bunch more C-style casts I missed in 0dc5656 to static_cast
(cherry picked from commit cb43d8b35fb3e0b9d8d3dd0d802db294e0720c35)
Commit: cc8a9e8128d814dfb56fedade785b7799dd3bfb0
https://github.com/wesnoth/wesnoth/commit/cc8a9e8128d814dfb56fedade785b7799dd3bfb0
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-28 (Sun, 28 Oct 2018)
Changed paths:
M src/scripting/lua_gui2.cpp
Log Message:
-----------
don't call invalidate_layout() unless needed
commit 8000a868 added an invalidate layout() call to fix issues arisiong from widgets that change its site when their 'value' is changes.
But with this, some dialogs, in particular the custom help dialgog in the addon "world conquest 2", reacted much slower to user input because invalidate_layout() causes the dialogs to recaclulate all its siszes which is very slow. Since most of the widgets, in particular 'multi_page' don't change their size when the value is changed, this commit fixes the mentioned custom help dialog by not calling invalidate_layout() when cahnging the value of those widgets.
(cherry picked from commit 808bd59dae43b57ff8f1fa39158af9722191872d)
Commit: f1a5bd09e8f570c5522aa79d552c6ffbb06edfb0
https://github.com/wesnoth/wesnoth/commit/f1a5bd09e8f570c5522aa79d552c6ffbb06edfb0
Author: josteph <josteph at fastmail.com>
Date: 2018-10-30 (Tue, 30 Oct 2018)
Changed paths:
M .gitignore
M .travis.yml
M RELEASE_NOTES
M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/12_Walking_Trees.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/13_Together_Again.cfg
M data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
M data/campaigns/Under_the_Burning_Suns/_main.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
M data/core/help.cfg
R data/core/images/terrain/village/hut-snow-night.png
R data/core/images/terrain/village/hut-snow2-night.png
R data/core/images/terrain/village/hut-snow3-night.png
R data/core/images/terrain/village/hut-snow3.png
R data/core/images/terrain/village/hut-snow4-night.png
R data/core/images/terrain/village/hut-snow4.png
M data/core/macros/deprecated-utils.cfg
M data/core/terrain-graphics.cfg
M data/core/units/undead/Corpse_Soulless.cfg
M data/core/units/undead/Corpse_Walking.cfg
M data/gui/macros/_initial.cfg
A data/test/scenarios/swarm_disables_upgrades.cfg
M data/themes/classic.cfg
M data/themes/default.cfg
M packaging/wesnoth.appdata.xml
M po/wesnoth-multiplayer/de.po
M po/wesnoth-tsg/de.po
M projectfiles/Xcode/Resources/SDLMain.nib/designable.nib
M projectfiles/Xcode/Resources/SDLMain.nib/keyedobjects.nib
M src/CMakeLists.txt
M src/actions/move.cpp
M src/ai/simulated_actions.cpp
M src/build_info.cpp
M src/desktop/apple_version.mm
M src/display_chat_manager.cpp
M src/formula/function.cpp
M src/generators/default_map_generator_job.cpp
M src/gui/core/event/message.hpp
M src/gui/dialogs/drop_down_menu.cpp
M src/gui/dialogs/editor/generate_map.cpp
M src/gui/dialogs/file_dialog.cpp
M src/help/help.cpp
M src/image_modifications.cpp
M src/playturn.cpp
M src/save_index.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_gui2.cpp
M src/scripting/lua_unit.cpp
M src/sdl/utils.cpp
M src/server/game.cpp
M src/soundsource.cpp
M src/synced_commands.cpp
M src/units/unit.cpp
M utils/pofix.py
M wml_test_schedule
Log Message:
-----------
Merge remote-tracking branch 'josteph/forward-port-some-of-the-174'
* josteph/forward-port-some-of-the-174:
don't call invalidate_layout() unless needed
Convert a bunch more C-style casts I missed in 0dc5656 to static_cast
fixup don't show travis notifications from forks (cherry picked from commit 55bc62f442da47f0b754ed9b75238c5a53fd76dd)
don't show travis notifications from forks (cherry picked from commit d6ab780ce94df14a6eb1eeb4df7ce2543fc27069)
fix out of bonunds check
Lua: Invalidate layout in set_dialog_value()
Fix includes
Implement iOS version detection
Game Load: Use child_or_empty().
Themes: Fix the observers icon being hidden under the minimap
Game Load: Restore the ability to select 1.12.6 savegames in the list
Fix CMake build on macOS
NR S8: compatibility commit to make the new companions from scratch if we don't have them stored
Partially revert "Additional village variations (#3342)"
DM: Add last breath dialog for Zorlan
DM: Generalize death message so it works when Delfador is young and old
gui2/unit_recall: Change Recall button back to its correct label
Updated changelog in Xcode
Add WML unit test for unupgradable (#3336)
gui2/unit_recall: Fix i18n issues
DM: add some TODOs
iOS: finger scrolling in controls.
iOS document directories. Might use these on other platforms as well.
.gitignore for CLion
German multiplayer translation: fixes
German translation: reword era descriptions
German translation: fix a string
Statistics Dialog: merge unit name and count labels
add / remove some comments
Tutorial Part2: Give the player a canche to undo his move
UtBS 5: changes to scenario locations (#3104)
Update changelog in macOS package
SotA: transform bats already after the 5th scenario
TRoW: revert workaround for #2912
Changelog entry for the #2912 work around
TRoW: Increase Rithrandil's workaround portrait height to 700
TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912
Add missing deprecation messages for deprecated macros
Northern Rebirth S02_01: keep side 8 leader from wandering off too far
changelog: remove AToTB AI entry
wesnothd: prevent another instance of crash from owner not in player_connections
Increased in-game chat size. This makes it render more smoothly
Minor tweaks to classic theme (thanks enclave for doing this)
Update RELEASE_NOTES (cherry picked from commit e2a2a85f16fb5984ad0e44b0ec3f16a5eb1ac823)
Update changelog for custom AI for AToTB S2
TRoW: revert changes, to avoid a potential OOS
Re-apply patches to fix issues #2844 and #2846 in SotA
Clear RELEASE_NOTES
Repair 66ab35f in the upwards direction
Add changelog for 1.14.0
add placeholer links to appdata file
Hide Editor help section
UtBS: readd do_not_list
UtBS: wmlindent pass
Fix MP label for #2855
Fixup 601c67d970c2eac
UtBS: Re-added compatibility code to load old saves using the new elves
Swap count and name columns in statistics (fixes #2893)
Revert string changes in SotA for 1.14 RC 3 - gold
AI recruitment: use unit-specific recall cost
AI recruitment: fix units on recall list interfering with recruiting
Fixup f7ab008 before GCC complains about an unused parameter >_<
Help: disabled parsing error popup
LoW: Fix translation error in conjunct list (fixes #2833) (#2834)
Fix pofix
Changelog entry for recent SotA fixes
Pofix entry for fc6c3ac04b899b4c7f629a1cd8d80101c7cbb20c
Pofix entry for b86a2968fe87a7e4112e900070446d4a83808202
Pofix entry for ab9f29a7a44372a3e3703fd842740a9b425b6f5f
Fix HP label in longer languages
Help: removed sort_sections key with invalid value
less redraw_everything calls when receiving [change_controller]
fix gui2 dialog disappearing after [change_controller]
Use a fallback for when the player name is not known in debug notifications
Compare: https://github.com/wesnoth/wesnoth/compare/e1da42ea91f6...f1a5bd09e8f5
**NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
More information about the Commits
mailing list