Commit graph

1357 commits

Author SHA1 Message Date
Iris Morelle
fa7ccab4c0 gui2/unit_create: Use unit type ids as filtering criteria as well
(cherry-picked from commit 444d6d63f6)
2018-10-07 03:24:53 +00:00
Severin Glöckner
ad594688be forwardport changelog entries
[ci skip]

(cherry-picked from commit d3d2decac9)
2018-10-07 03:24:53 +00:00
Iris Morelle
dce867921c gui2/unit_create: Allow searching by race name as well
(cherry-picked from commit b7c7fca8b1)
2018-10-07 03:24:46 +00:00
Iris Morelle
7fe7047ba9 gui2/unit_create: Fix segfault on empty list when updating unit preview
This happens when the list comes up empty because of a non-matching
filter, e.g. "Elvish Archer222" and the user clicks on one of the gender
options in this state.

Ideally we should clear the preview pane and disable the options and OK
button here, but the former appears impossible and for some reason
changing the pane's visibility in filter_text_changed() doesn't work
reliably.

(cherry-picked from commit 26629d4a62)
2018-10-07 03:24:46 +00:00
Iris Morelle
0c0192c58d gui2/game_load: Constrain leader sprites to 72x72 using image path functions
Fixes #3474.

(cherry-picked from commit 36cf8c8d70)
2018-10-07 03:24:17 +00:00
mattsc
af608e686a Update changelog
(cherry-picked from commit c59a084f11)
2018-10-07 03:24:16 +00:00
sigurdfdragon
7027930cf1 Units: Have Saurian warriors be female to fit lore in mainline
Fixes #3392 & goes along with #3372.

(cherry-picked from commit ce6826d80e)
2018-10-07 03:24:16 +00:00
Martin Hrubý (hrubymar10)
377c9dd15e Update changelog
(cherry-picked from commit 29c5d25e27)
2018-10-07 03:24:08 +00:00
sigurdfdragon
2dc3b198c9 Update changelog
(cherry-picked from commit c2cf0288fc)
2018-10-07 03:23:52 +00:00
Iris Morelle
b02b3e5048 Sync 1.14 changelog
[ci skip]

(cherry-picked from commit c56e8aa695)
2018-10-07 03:23:48 +00:00
gfgtdf
120e8d9911 disallow loading lua bytecode via load/dofile (CVE-2018-1999023)
This could otherwise be used to escape the lua sandbox, as described in
multiple sources. For example one can use it to reenable the os.execute
function to do shell commands

The affected functions were
load,loadstring,wesnoth.dofile,wesnoth.require and various places in the
wesnoth source where lua chunks were loaded for example by the ai code.

This commit also changes the lua source to change luas load (which is
the same as loadstring), alternatively we could add a wrapper around the
original load function that always passes "t" as third parameter, i went
this way mostly because it was easier to implement, but also because i
was not 100% sure that is is impossible to query the upvalues of a
function via lua (wesnoth disables debug.getupvalue but still).

There is also an occurance in the application_lua_kernel that was not fixed
because i assumed that umc cannot contian application lua scipts.

As further security measure we might want to disable printing the function
adress in luas tostring for c functions, this cannot be exploited by itself
but it can be used to defeat ASLR in some cases.

(cherry-picked from commit 2554c166dd)
2018-10-07 03:23:45 +00:00
Toom
0682be84e6 Fix 4801629ab1 typos
[ci skip]

(cherry-picked from commit c0727bacf3)
2018-10-07 03:23:42 +00:00
gfgtdf
09522ccdf8 fixup update changelog.md
(cherry-picked from commit b684c8b3aa)
2018-10-07 03:23:41 +00:00
gfgtdf
2f7568d432 Update changelog.md
(cherry-picked from commit 4801629ab1)
2018-10-07 03:23:41 +00:00
Jyrki Vesterinen
f05bcb7b61 Changelog: fix issue #3277 being mistyped as 3722
(cherry-picked from commit aea5d67f93)
2018-10-07 03:23:40 +00:00
Elvish_Hunter
cb4c5301ad wmlindent: fixed crash on non-existent paths
Fixes #3346

(cherry-picked from commit af63d17e32)
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 f6f1093661)
2018-10-07 03:23:39 +00:00
Nils Kneuper
624de09b1a updated Bulgarian translation
(cherry-picked from commit 111b5db7b4)
2018-10-07 03:23:37 +00:00
Martin Hrubý (hrubymar10)
674fda85b7 Migrate links to https if available - Fwd c18537edc0
(cherry-picked from commit bc4d22dc72)
2018-10-07 03:23:36 +00:00
Nils Kneuper
06423777b4 updated Hungarian translation
(cherry-picked from commit 3a3bf21e37)
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 d5972c6f43)
2018-10-07 03:23:26 +00:00
Charles Dang
aba5b94b99 Upgrade to Lua 5.3.5
(cherry-picked from commit 264389807c)
2018-10-07 03:23:26 +00:00
Jyrki Vesterinen
c1ba1e77ba Fix #2789: lobby chat scrolls to top on new messages if not at bottom
(cherry-picked from commit 1699c0d3f9)
2018-10-07 03:23:23 +00:00
sigurdfdragon
cb6ce938c7 Update changelog
(cherry-picked from commit 4fbeff273a)
2018-10-07 03:23:22 +00:00
Charles Dang
ab125c5115 Updated changelog
[ci skip]

The chatbox entry was redundant.

(cherry-picked from commit d8426ac37a)
2018-10-07 03:23:22 +00:00
sigurdfdragon
f20ceac0f6 Update changelog
(cherry-picked from commit 7d60eeeefb)
2018-10-07 03:23:11 +00:00
Iris Morelle
54a3546f1e wmllint: Skip inexistent paths passed in the command line
Fixes issue #3286.

[ci skip]

(cherry-picked from commit fbc9ac5a52)
2018-10-07 03:23:01 +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 c92e167a14)
2018-10-07 03:22:59 +00:00
Jyrki Vesterinen
cdbb8cc491 Fixed saving a map as a scenario not enabling scenario editor tools
(cherry-picked from commit 4bda3e7311)
2018-10-07 03:22:57 +00:00
Iris Morelle
bf2d7d53e6 campaignd: Detect .po files in add-ons and add them to the list of locales
(cherry-picked from commit 1db6fb393e)
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 e46c05162f)
2018-10-07 03:22:54 +00:00
Charles Dang
4b6d883c3b Updated changelog
[ci skip]

(cherry-picked from commit 48c13761cc)
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 207e763401. Was only working for unit types.

(cherry-picked from commit f59f68a527)
2018-10-07 03:22:52 +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 0c2298d8c2)
2018-10-07 03:22:48 +00:00
Iris Morelle
746b1c9235 U does not precede G in the English alphabet
[ci skip]

(cherry-picked from commit 6b2ca32026)
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 cdc8da25ae)
2018-10-07 03:22:47 +00:00
Charles Dang
9c9fbe4649 Faction Select: fixed changes persisting even if you cancel the dialog
(cherry-picked from commit c2c613325b)
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 a5169f7c50)
2018-10-07 03:22:39 +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 e8d55062c4)
2018-10-07 03:22:34 +00:00
Charles Dang
447e946e86 Updated changelog
[ci skip]

(cherry-picked from commit 802443eaf9)
2018-10-07 03:22:32 +00:00
Charles Dang
3f9137f7e8 Added an advanced preference for the PRNG combat option
[ci skip]

(cherry-picked from commit 8baeb8457d)
2018-10-07 03:22:31 +00:00
Celtic Minstrel
6698a8269a Remove duplicate changelog entries
(cherry-picked from commit 93d4a12375)
2018-10-07 03:22:31 +00:00
Charles Dang
d002ce2abf Changelog: moved an entry, fixed a typo
[ci skip]

(cherry-picked from commit b27d1c21f5)
2018-10-07 03:22:31 +00:00
Charles Dang
d1e1214f20 Removed a duplicate changelog entry I missed
[ci skip]

(cherry-picked from commit 92c67f5244)
2018-10-07 03:22:30 +00:00
Charles Dang
9baabd8b18 Removed duplicate changelog entries under the 1.15.0-dev header
[ci skip]

These were all mentioned between 1.13.13 and 1.14.3, meaning the remaining changes
are everything new in 1.15.0-dev so far. Also removed one entry that was mentioned
twice in the WML Engine section.

(cherry-picked from commit 70a1cdd3e6)
2018-10-07 03:22:30 +00:00
Charles Dang
1871a32995 Statistics Dialog: remove mode toggle in favor of an All Scenarios menu entry
Closes #2886.

(cherry-picked from commit b5f1e1a48a)
2018-10-07 03:22:30 +00:00
Charles Dang
27279f96e1 Added 1.13.13 - 1.14.3 changelog sections
[ci skip]

Duplicate entry cleanup for the 1.15.0-dev section to come

(cherry-picked from commit 556d088e57)
2018-10-07 03:22:29 +00:00
Charles Dang
115c8d1d0c DiD S1/S6: new Parthyn maps
[ci skip]

(cherry-picked from commit b6416b8329)
2018-10-07 03:22:29 +00:00
Iris Morelle
16b3e3dba1 Move changelog entry around
[ci skip]

(cherry-picked from commit ce8bf3cfc3)
2018-10-07 03:22:28 +00:00
Charles Dang
201b2973d2 Fixed [scenario] map_file basically being unusable
Automatically checking the path relative to a maps/ directory without binary
path support results in an invalid path almost every single time. If I remember
correctly from my testing, the only time that worked was if I added a data/maps
folder.

(cherry-picked from commit 42349651cb)
2018-10-07 03:22:28 +00:00