72651 Commits

Author SHA1 Message Date
Charles Dang
2420e61d14 Swapped the first watch and second watch ToD graphics
[ci skip]

See #1905.

(cherry-picked from commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8)
2018-10-07 03:22:55 +00:00
Charles Dang
611bacf3b6 Cleaned up addon loading process
This makes it so addon metadata (title, version) will be fetched from _server.pbl if
present and _info.cfg if not (see #3278).

This also eliminates the temporary addon_source struct and unifies the metadata parsing
and actual loading stages. They used to be separate since single-file addons were a
thing, but those were removed in 3f640b8e718e4c45d8f73798d839bfea0b413fab.

Also a bunch of minor code cleanup.

(cherry-picked from commit cd3c13aca223e8a8c681556fe8020915d98058e0)
2018-10-07 03:22:55 +00:00
josteph
9e9e1e800f Replay: Don't disable the "Point of view" button after reset
Fixes #3107

(cherry-picked from commit fb88f40b61eb541f227e2ed62b148ba33c042e44)
2018-10-07 03:22:55 +00:00
Iris Morelle
bf2d7d53e6 campaignd: Detect .po files in add-ons and add them to the list of locales
(cherry-picked from commit 1db6fb393ea468a3657e0f7e1053b48c947c05a9)
2018-10-07 03:22:54 +00:00
Iris Morelle
8763e2f2b1 sound: Halt sound sources that go inaudible instead of fading them out
Fixes #3280.

(cherry-picked from commit e46c05162fdab578d172cf06e7b35792b045223a)
2018-10-07 03:22:54 +00:00
josteph
2b2b08431e Revert "Excluded data/test/ from tarball"
This reverts commit c93482560779c0e137d9598b9e7185338afe2b82.

Keep data/test/ in 'scons dist' tarballs to match official tarballs.

(cherry-picked from commit bad6897cbc75225624814b66c9226cf6233e95cf)
2018-10-07 03:22:54 +00:00
josteph
0b633badc5 Fix 'scons dist'
This makes 'scons dist' work, although the resulting tarballs are not
yet identical to cmake tarballs.

Remove awk usage made obsolete by the git transition
(7f85fa000c836c27cfe9d829db3b0e8aaeb49821).

Update src/revision.hpp reference to use src/revision.h.  The former
name is unused since at least 7625b1e079b470119d72ea67ce955104f464e4b8.

(cherry-picked from commit 0ee485415710288d27f7b766e48fe7451b03c9a4)
2018-10-07 03:22:53 +00:00
Charles Dang
b9c26464b6 Select Orb Colors: used a widget iterator instead of a walker
The documentation indicates you're not really meant to use the walker directly.
They're part of the implementation of the iterators. They could be used directly,
as shown here, but this is shorter.

(cherry-picked from commit aca7d4e6df4648ff45f48b6acb9e643de8c05103)
2018-10-07 03:22:53 +00:00
Charles Dang
4dd931b54c GUI2/Iterator: added some alias templates and a get() function
(cherry-picked from commit 1eaa51b3f9033723ac5f18d65d25780d761c2ae7)
2018-10-07 03:22:53 +00:00
Charles Dang
4b6d883c3b Updated changelog
[ci skip]

(cherry-picked from commit 48c13761cc16e5b62ec099487fdcfc5a94a5b116)
2018-10-07 03:22:53 +00:00
Charles Dang
bdb5f34c9b GUI2/Unit Preview Pane: fixed default race icon not showing for units
Missed in 207e763401a11e86c6c8ad3602efa514812bf902. Was only working for unit types.

(cherry-picked from commit f59f68a5277cb1dcbbbccc023ad005e7653d4fd2)
2018-10-07 03:22:52 +00:00
Charles Dang
e679abcf84 Pango/Escape: used a stringstream for constructing the escaped text
(cherry-picked from commit 69207298120734b283e7a30ec9e0d2b2b9889ec7)
2018-10-07 03:22:52 +00:00
Charles Dang
a5859dc957 Drop Down List: added documentation and did some code cleanup
(cherry-picked from commit b6a0b2cb870a8e4a4c154362c2924bc2245c8587)
2018-10-07 03:22:52 +00:00
josteph
c38c37fa3c Rename unit_recall_default_compare to default_compare
(cherry-picked from commit 46fb1b6d48708478c8fbba755f4790fe9323c5a3)
2018-10-07 03:22:51 +00:00
josteph
b6356f57e4 Unit List: Sort by XP as second criterion when sorting by level.
Fixes #3260.

(cherry-picked from commit 5316a83349496bf247416d93396d5bcae4a730e6)
2018-10-07 03:22:51 +00:00
Severin Glöckner
56c347fad0 NR S5a: clarify text
[ci skip]

(cherry-picked from commit 37566db87c364daa15c1e80761160f0eb7ebaba0)
2018-10-07 03:22:51 +00:00
Pentarctagon
e405dc2bff Disabling hardening on Windows due to tdm-gcc's poor support.
As per sigurd's trial and error: RELRO's options are unknown entirely and -fstack-protector-strong results in compile errors.  Building with just PIE and _FORTIFY_SOURCE enabled does then compile, but results in a broken executable.

(cherry-picked from commit c9541176776aeb676e99f1804d123552430582ee)
2018-10-07 03:22:51 +00:00
Severin Glöckner
ee6af7d8ce NR S7a: remove dots from objectives
[ci skip]

(cherry-picked from commit e1cd47b8ec8c9b623b73a7bd269fcc767f3849e8)
2018-10-07 03:22:50 +00:00
josteph
73cb9cff96 MP Faction Select dialog: Always show the leading unit information, never "Unknown Unit".
(cherry-picked from commit 175aa8194138a81dfcb6a975c625ad78bf8c207e)
2018-10-07 03:22:50 +00:00
josteph
9f2cbad96f MP Faction Select dialog: Show leader unit details.
If the leader hasn't been discovered, the "Unknown Unit" topic will be shown.

Fixes #1491

(cherry-picked from commit a8f83f6e687abe997d33a028f841c0bdd5495a11)
2018-10-07 03:22:50 +00:00
Nils Kneuper
2b2dd321c9 updated Slovak translation
(cherry-picked from commit e94af64b8dcad498f0a2825b4b9fb0ce00c10bb7)
2018-10-07 03:22:50 +00:00
Nils Kneuper
aed2ab29f7 updated French translation
(cherry-picked from commit 63e4c16f1d82c02b9e27882840d3453a14beb110)
2018-10-07 03:22:49 +00:00
josteph
bf8cd9f90b GUI: Fix the direction of the arrow on a listbox sort column header.
This affects the files list in the the "Load Game" dialog.

(cherry-picked from commit 8481927a5a630165c98a7c81c5cf5556ccfc9e35)
2018-10-07 03:22:49 +00:00
Pentarctagon
d6833d76d0 Remove unused test file and images.
(cherry-picked from commit 0a7ed44c087f1c66d65b8656fc197309d4c0325a)
2018-10-07 03:22:49 +00:00
newfrenchy83
fb403a982a Update wesnothd.cbp
(cherry-picked from commit 9bcaf3a897b2c9174f11d24112a89b7577628f08)
2018-10-07 03:22:48 +00:00
newfrenchy83
18642d983b Update wesnoth.cbp
(cherry-picked from commit cffd51a42570350a7e9704c44a602444c7cad0d2)
2018-10-07 03:22:48 +00:00
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