72475 Commits

Author SHA1 Message Date
Iris Morelle
6ee18b58f6 config/cache: Ensure built-in symbols like WESNOTH_VERSION are always defined
Half-fix for issue #1634 and issue #1924.

The issue that remains to be solved is that on subsequent sessions after
a campaign has failed to load, it is possible for the game to generate a
cache entry for it that only contains the main menu WML for it.
Apparently the config cache transactions mechanism causes the game to
try to generate a cache entry with the wrong defines (a define set that
doesn't include the campaign's symbol, for instance) instead of the ones
that are actually needed and used to match the cache entry's filename
via checksumming. As a result, on subsequent sessions the failed
campaign is aborted with "failed to load the scenario" instead of
displaying the real WML error again (since the error is not hit again if
it depends on the campaign's symbol being defined).

In the meantime, this at least removes the red herring error and makes
the underlying issue a bit more visible. It's a very crude hack but it
does the job.

(cherry-picked from commit 0c2298d8c2057344b9c94c9fe7ce848838b363e6)
2018-10-07 03:22:48 +00:00
Severin Glöckner
adeda87982 SotA: reuse mainline string for ancient lich
[ci skip]

(cherry-picked from commit 9d95aa776c9e0b3a6e968317a87bda1a5c48b3ee)
2018-10-07 03:22:48 +00:00
loonycyborg
6d0ac6b58e flatpak: pass hardening options when building static boost
(cherry-picked from commit f5974941576fb541ebddb0d3e690cc469b8f5e75)
2018-10-07 03:22:47 +00:00
Charles Dang
8137e9a454 GUI2/Chatbox: limit input to 256 characters (fixes #3267)
[ci skip]

(cherry-picked from commit c5d6f695dd712c9a33fd3a5c12f98e19e2b393fd)
2018-10-07 03:22:47 +00:00
Iris Morelle
746b1c9235 U does not precede G in the English alphabet
[ci skip]

(cherry-picked from commit 6b2ca320261326d7862d3fe52f395e83913f9c6d)
2018-10-07 03:22:47 +00:00
Iris Morelle
7e51f119de wesnothd: Fix lobby messages and whispers not being truncated as they should
For lobby messages, there was a length cap in place already, but the
truncated message was lost in processing because it ended up in a WML
document that isn't the one relayed to listening clients.

On the other hand, whisper messages were missing the truncate logic
entirely. Oops.

(The logic for in-game messages does truncate messages correctly as far
as I can tell, and additionally the client UI doesn't allow overlong
messages.)

Thanks to Soliton for pointing me towards the faulty code.

(cherry-picked from commit cdc8da25aea2cbc055dc12879d2c4333fecfc3e1)
2018-10-07 03:22:47 +00:00
Iris Morelle
b14b1e9509 wesnothd: Only disclose the number of online admins to admins using adminmsg
(cherry-picked from commit be41a692fb44cba62b720a462f5bebe7efec303c)
2018-10-07 03:22:46 +00:00
ln-zookeeper
0c5a47def4 UtBS: Cropped Kaleh's base sprite back to 72x72
[ci skip]

(cherry-picked from commit a98c6587425f9d34e0f0316133e7757902d0c3ed)
2018-10-07 03:22:46 +00:00
ln-zookeeper
3be3f0acbb EI S17b: Prevent spell breaking effect playing out twice (fixes #3254)
(cherry-picked from commit a702674da2fa8df0b47126a3ee51c255d90aab26)
2018-10-07 03:22:46 +00:00
Iris Morelle
aaa055a6ac pofix: Add rules to address typographical fixes to race descriptions
NOTE: the rule for the "true orc" case does not work. The string in
question will just have to be fuzzied.

[ci skip]

(cherry-picked from commit 72948787450d2ba273b9a901455ae02ccf1cce5e)
2018-10-07 03:22:45 +00:00
Iris Morelle
4712fe1cc6 Fix several typographical style errors in recent race descriptions
[ci skip]

(cherry-picked from commit 61e94c21a9d2a7e6b195f245361900329a624af8)
2018-10-07 03:22:44 +00:00
josteph
01bd2af9ae Preferences: Improve label and tooltip of 'Accelerated speed' slider.
(cherry-picked from commit d95efd3409f75614c48732dc3532e6fd2f166dd4)
2018-10-07 03:22:44 +00:00
josteph
ea643fff18 Preferences: Keep the acceleration speed slider enabled even when the checkbox is disabled.
Apparently, this also causes the slider's value to be saved when dismissing the dialog with the checkbox disabled.

Fixes #2741

(cherry-picked from commit e126e5ba3672fe87e7045bce8580ac26b1f536aa)
2018-10-07 03:22:44 +00:00
Pentarctagon
9e78232e0e Fixup hardening options for Windows.
(cherry-picked from commit 277158222200d4131bbbb385e45a8c6993020b44)
2018-10-07 03:22:43 +00:00
doofus-01
2482cf2c53 UtBS S08: mostly cosmetic changes to map
(cherry-picked from commit 41adc41093a47de4508e093508cbf83cb45ddcf0)
2018-10-07 03:22:43 +00:00
doofus-01
b1d97a8496 UtBS S06b and S07b: cosmetic changes to maps, to make them more fitting with dialogs
(cherry-picked from commit 13ec0493fc810b184771b937e3b8e3ef67c3c5dc)
2018-10-07 03:22:43 +00:00
doofus-01
4d897f4e96 UtBS S06b: make sure dwarf sergeant is facing the right way in comic-relief dialog
(cherry-picked from commit ea3ee2a336320d955f4efa171ff862954f8c37cf)
2018-10-07 03:22:43 +00:00
doofus-01
fbb8817931 change sun-sylph halo to be warmer, sunny color, instead of clean, holy color
(cherry-picked from commit a3294cd04d6be0c4badfea84daf0e65a5cc6cd48)
2018-10-07 03:22:42 +00:00
doofus-01
9f74f4bff1 slight tweak to Kalehs base sprite
(cherry-picked from commit f0b963a2b168637206c2ffb7b0a01edbda8b33ce)
2018-10-07 03:22:42 +00:00
doofus-01
a66d47425e UtBS S05: replace troll camps with actual troll camps instead of orc castles
(cherry-picked from commit 5fbd494244fc01cf4f1df0930f92e5f900d95ed0)
2018-10-07 03:22:42 +00:00
doofus-01
0b818bd29a UtBS S04 and S05: some variations in scenery items
(cherry-picked from commit 4b1a06a82da5883bdbe5408a0667c3c1cff893d0)
2018-10-07 03:22:41 +00:00
Nils Kneuper
f0dfd2e8f5 updated Slovak translation
(cherry-picked from commit 37ccd8321533bfcc5cbd53f19dbfdf0f14d1c8d2)
2018-10-07 03:22:41 +00:00
Charles Dang
08874f69cf Select Orb Colors: cleaned up dialog implementation
Also fixes #2958 in the process since the entire setup process isn't repeated
when resetting selections.

(cherry-picked from commit 30121aeb9c31420564d0249e99cf777098244d83)
2018-10-07 03:22:41 +00:00
Charles Dang
32f0f0e03a GUI2/Multimenu Button: fixed maximum_shown defaulting to 0 instead of 1
Fixes the campaign selection dialog's modification dropdown saying "1 other" for
the first mod you select.

(cherry-picked from commit f54b3f722515c94a96d8ba1694e65ae4697c1c01)
2018-10-07 03:22:41 +00:00
Charles Dang
025af47181 GUI2/Multimenu Button: store max shown count as an unsigned int
A negative count here makes no sense...

(cherry-picked from commit 23740ea3cfd625a6e4c0ab2575db0d1c6f247ff4)
2018-10-07 03:22:40 +00:00
Charles Dang
4b1340598d Cleaned up two emplace_back calls
(cherry-picked from commit f95dc40f132afb79432d4a73db88406b5c5e7b9d)
2018-10-07 03:22:40 +00:00
Charles Dang
ad12193cf9 GUI2/Menu Button: store selected index as an unsigned int
Also initialized it to 0 in the ctor instead of relying on that being set
via set_values().

(cherry-picked from commit e8bd3c26d2dfaed83edb5f66b55b3ddaa5004911)
2018-10-07 03:22:40 +00:00
Charles Dang
24a99da305 Fixup unused parameter
(cherry-picked from commit 3526aa8e86ee62b1a5fa9732238f55b563d031a8)
2018-10-07 03:22:39 +00:00
Charles Dang
9c9fbe4649 Faction Select: fixed changes persisting even if you cancel the dialog
(cherry-picked from commit c2c613325b075a57728e4bf87659fd2606817630)
2018-10-07 03:22:39 +00:00
Charles Dang
a1a46b059d Faction Select: declared an execute() helper
(cherry-picked from commit 0632f91bd6492b8cc6ce34866e6fe76eecc3d8b4)
2018-10-07 03:22:39 +00:00
Charles Dang
b5344a7991 GUI2/Menu Button: allow changing selections with the scrollwheel (closes #3251)'
The changelog entry is under 1.14.3+dev since this is going to be backported.

(cherry-picked from commit a5169f7c501ed6675ba814cd86f4f10bf9059544)
2018-10-07 03:22:39 +00:00
Charles Dang
247750e598 GUI2/Menu Button: changed callbacks to NOTIFY_MODIFIED ones
menu_button doesn't even actually inherit from clickable_item. The only reason
[dis]connect_click_handler was declared in this class is the original implementation
was copied extensively from the Button widget.

Using NOTIFY_MODIFIED also means callbacks can fire if set_value/set_selected is used
on a menu_button.

The [dis]connect_click_handler functions were also removed from multimenu_button. All
callbacks for this widget type already used NOTIFY_MODIFIED signals.

(cherry-picked from commit 55f14ff22cf09c8e28da3c97731913349073fcd1)
2018-10-07 03:22:38 +00:00
Charles Dang
4f34220e59 GUI2/[Multi]Menu Button: removed retval handling
Retvals are only relevant for widgets that are supposed to trigger something
like a window closure, and that makes sense for neither of these widgets. The
only reason the Menu Button widget has it is its original implementation was
largely copied from the Button widget, and the Multimenu Button widget copied
from the Menu Button widget.

(cherry-picked from commit 2d9b7d82c6a602c0b142bea38cebdb3650db62d6)
2018-10-07 03:22:38 +00:00
Charles Dang
a025eaaadd GUI2: added a bunch of missing virtual specifiers
(cherry-picked from commit d7edb83b165c5e6225783e1bbb65d1d040bebe6d)
2018-10-07 03:22:38 +00:00
Steve Cotton
1aa974a250 Prose: the Storm Trident's description uses "merfolk" (issue #2936)
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).

(cherry-picked from commit ad7bc19dd98990b443bd5037952ff612dce502af)
2018-10-07 03:22:37 +00:00
Steve Cotton
175c95a2df Dead Water: Change "mermen" to "merfolk" (part of #2940)
This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.

(cherry-picked from commit d5f6c1723910ba32326aff466c1fb710f6afa803)
2018-10-07 03:22:37 +00:00
Steve Cotton
b87c36274a DW: Change the team name from Merman Forces to Merfolk
(cherry-picked from commit 94dd2880c6f71e16bee607ebb7b3fbd2c2e5b410)
2018-10-07 03:22:37 +00:00
Pentarctagon
bc3ad71f03 Fixup for osx hardening options.
(cherry-picked from commit da6ebc7423ea7b2e8a242ceb44f7bc72f2d08426)
2018-10-07 03:22:37 +00:00
Pentarctagon
6be6646a4e Enabled hardened executables by default.
The result of running "hardening-check wesnoth" now shows:
* Position Independent Executable: yes
* Stack protected: yes
* Fortify Source functions: yes (some protected functions found)
* Read-only relocations: yes
* Immediate binding: yes

(cherry-picked from commit 3290961db2eb00221c94f88f02f77ab640f497a4)
2018-10-07 03:22:36 +00:00
Charles Dang
98299d56ef End Credits: reduced text surface size by 42%
[ci skip]

Really no reason for the text area to grow since the text is set in pre_show and
therefor the widget is always the right size. >_<

(cherry-picked from commit 01d37ca7953f3efdd143f7265ecc94dc01791ebb)
2018-10-07 03:22:36 +00:00
Steve Cotton
58d046cacd DW S05: Add a po hint about the orc saying "mermen" (part of #2940) (#3243)
The orc calls them fish-men several times, so changing it to "merfolk"
wouldn't fit.

Also a whitespace fix from wmlindent.

[ci skip]

(cherry-picked from commit ce093e229016f09da90415dd59305c36958b7c18)
2018-10-07 03:22:36 +00:00
ln-zookeeper
c2bba0512f EI S11: Fixed missing prisoners (fixes #3237)
The problem was introduced by commit 0f511e8 due to the [modify_unit] tag apparently causing prisoners to disappear because technically they were duplicates as they had merely been unstored and still existed on the recall list as well.

(cherry-picked from commit c9bb31d1cc9182a4450f29ae529416d2192ab4f9)
2018-10-07 03:22:36 +00:00
Iris Morelle
8ebc39fab2 doc/wesnoth(6): 'none' is a keyword in the --log-<level> description
[ci skip]

(cherry-picked from commit d05de7ced84fc2d8fcb4c3ec3dc8d49d939886ef)
2018-10-07 03:22:35 +00:00
Iris Morelle
90ad7f51ca pofix: Update with 1.14.3 -> 1.14.3a (macOS) rules for the website
[ci skip]

(cherry-picked from commit e636549497feaccc4b9ea3cc5857b148e86a30ee)
2018-10-07 03:22:35 +00:00
Thom Diment
26dd437f81 DW 5 Tirigaz - Changes to orc leader death event (#3103)
DW 5 Tirigaz - Changes to orc leader death event

Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader

(cherry-picked from commit b3c40498d83d4ad3d0701baaee7ca8166546c7e3)
2018-10-07 03:22:35 +00:00
loonycyborg
d474ca9796 Update flatpak manifest
(cherry-picked from commit c78e95cf6c149095b88e18fecd7421e4f0f0a844)
2018-10-07 03:22:35 +00:00
doofus-01
fdd8f5737d UtBS S12: Make alien central body vulnerability more visible to player
(cherry-picked from commit 636575627d6616c47a7678c71fc127d8f8dde841)
2018-10-07 03:22:34 +00:00
doofus-01
1e8163c93f UtBS S11: Citadel graphics, drawn over the cavewall donut
(cherry-picked from commit 79246493191443ccac936b92b6d413a3d28c126e)
2018-10-07 03:22:34 +00:00
Iris Morelle
b524c05e04 pofix: Update with 1.14.2 -> 1.14.3 rules for the website
[ci skip]

(cherry-picked from commit 73680ed764840a2e61d54d859a4768c75b873b3c)
2018-10-07 03:22:34 +00:00
Charles Dang
2b4ae206ab Fixed MP admins being unable to observe private games (fixes #2851)
This was due to the change in the MP initialization process wherein the lobby wouldn't
show up until the initial gamelist was received. Since the admin auth message is sent
after [join_game] and before the initial gamelist, and the chatbox widget handled parsing
the auth message, the client was never marked as authenticated and therefor couldn't
observe private games. This fixes that by adding auth parsing to the MP initialization
process.

Note this doesn't fix the issue of the auth confirmation not showing up in the lobby chat
(issue #2920). I'll have to think of a way to fix that separately.

(cherry-picked from commit e8d55062c4293391ce6a9d70ed24bfa57aaa6490)
2018-10-07 03:22:34 +00:00