72519 Commits

Author SHA1 Message Date
Charles Dang
106d66009b MP Lobby: escape any game name formatting *after* receiving it from server
This avoids an issue where people could still apply formatting by using an older client.
Granted, any formatting would still appear in-lobby to anyone using an older client, but
this at least prevents the possibility of formatting appearing indefinitely if a game host
happens to never update their own client.

(cherry-picked from commit 9c311e2ca5db1f2b53570ae5bc0681f574c66f9d)
2018-10-07 03:23:00 +00:00
Charles Dang
06dd8d421d Updated a credits entry regarding the Dunefolk
[ci skip]

(cherry-picked from commit 0cbbed2832fc34f73927e38bf0141b4b7c636346)
2018-10-07 03:23:00 +00:00
Charles Dang
5a4cb1d471 Revert "MP Create Game: escape any formatting applied to game name"
This reverts commit 58a2e23a0c78078844f7fc2d684f04f448081f8b.

(cherry-picked from commit 87fcacbd28981933b3f3f190d1bfc9e7c18126fb)
2018-10-07 03:22:59 +00:00
Charles Dang
0b22ffbacf MP Create Game: escape any formatting applied to game name
This is a good point since it ensures any place that might use the title before the lobby
(don't think there's any such places right now) won't inadvertently get formatted.

Also might be worth looking into a way to just strip formatting completely.

(cherry-picked from commit 58a2e23a0c78078844f7fc2d684f04f448081f8b)
2018-10-07 03:22:59 +00:00
Iris Morelle
fb409b5db4 wmllint: Leave gzipped binary files alone, they're not safe for consumption
Fixes wmllint crashing like this upon encountering a gzip tarball in an
add-on:

  Traceback (most recent call last):
    File "/home/shadowm/bin/wmllint-1.14", line 3188, in <module>
      for fn in allcfgfiles(directory):
    File "/home/shadowm/bin/wmllint-1.14", line 2944, in allcfgfiles
      if interesting(os.path.join(root, name)):
    File "/home/shadowm/bin/wmllint-1.14", line 2927, in interesting
      return fn.endswith(".cfg") or is_map(fn) or issave(fn)
    File "/home/shadowm/src/wesnoth-1.14/data/tools/wesnoth/wmltools3.py", line 270, in issave
      return firstline.startswith("label=")
  TypeError: startswith first arg must be bytes or a tuple of bytes, not str

[ci skip]

(cherry-picked from commit c92e167a14229ed0d9b6f16f1d1ca31cacd292cd)
2018-10-07 03:22:59 +00:00
gfgtdf
81bd61ae14 wb: fix wrong simulated movement points when planning to capture a village.
(cherry-picked from commit ff82a007d5330baa89c0f9063e71f221db527f00)
2018-10-07 03:22:59 +00:00
gfgtdf
bd97d0c471 wb: remove outcommented code
(cherry-picked from commit 17a91649045415179f77342053cb784124f98e58)
2018-10-07 03:22:58 +00:00
gfgtdf
5c43c70cba wb: don't remove invalid actions from other players
this would bring the whiteboard data of the differnt clients out of sync  which could be a problem since the wb network protocoll identifies the actions to be removed ot replaced by index.

(cherry-picked from commit 3a28c3a3460aaff0d59826f401623dad8ecadb3f)
2018-10-07 03:22:58 +00:00
gfgtdf
7e32681b46 wb: dont send delete of actions of other sides
(cherry-picked from commit ee00b88427ac229ee9ff68e706782c049ca781ee)
2018-10-07 03:22:58 +00:00
Jyrki Vesterinen
cdbb8cc491 Fixed saving a map as a scenario not enabling scenario editor tools
(cherry-picked from commit 4bda3e7311c7b54742fbd29cb725dc0b292de633)
2018-10-07 03:22:57 +00:00
Andras Szell
a2a22ae10b Fix: add redraw to narrator's message so village count is refreshed
Fixes: https://forums.wesnoth.org/viewtopic.php?f=21&t=48370

In the tutorial when we occupy the first village the message tells us the
village count got incremented, but in the old version it was incremented
only afterwards. Non-narrator messages were updated properly. By adding the
redraw, narrator messages triggered by capture event produce the same
result as other speakers.

(cherry-picked from commit 1ea4149a4456ab8713dde4fbfcdd446b5762adcf)
2018-10-07 03:22:57 +00:00
DisherProject
826a76a939 Fix weapon specials marked as inactive
(cherry-picked from commit 902cf6dcfb6fd1d25e403acc8a57c8e16a61535b)
2018-10-07 03:22:57 +00:00
Charles Dang
0e5eb5067e Revert "Swapped the first watch and second watch ToD graphics"
[ci skip]

This reverts commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8.

(cherry-picked from commit 0aa60a7b4cc3492f9d84c765f6218f00aee8830e)
2018-10-07 03:22:57 +00:00
Charles Dang
92b95d7a44 Unit Advance: left-align header
[ci skip]

(cherry-picked from commit 893860321a8da181164782b13a931b6c61f5febd)
2018-10-07 03:22:56 +00:00
Charles Dang
e8c65ebece Fixup 862b086
(cherry-picked from commit 3147be87718d5685dc41dd73256692268c41b6e6)
2018-10-07 03:22:56 +00:00
Charles Dang
81083e5cea Fixup tests for 4eee386
(cherry-picked from commit 862b086ba9d43edb87362bbf4b7f75355eb50955)
2018-10-07 03:22:56 +00:00
Charles Dang
e98ec7e846 Cleaned up a few game_config_manager.hpp includes
(cherry-picked from commit feb99c384a3da58380697bfcf9ad18bc57df950f)
2018-10-07 03:22:56 +00:00
Charles Dang
f46e217454 Stop passing a milion game_config refs around during game initializaton
There are only 3 places where it's actually really needed. Used the game_config_manager
singleton to retrieve a reference in those cases.

(cherry-picked from commit 4eee386664b66e801bd4498e8730c017af03f0aa)
2018-10-07 03:22:55 +00:00
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