71800 Commits

Author SHA1 Message Date
Iris Morelle
e7c0a69420 Fix segfault when trying to log into the MP server with an empty password
Probable regression introduced in commit
02ab29d2f19800d28fa10476c48261be1083ad2c (1.13.14).

(cherry-picked from commit fc88cdff3b04a77a6de6d3911821cf4e1c7612d6)
2018-10-07 03:19:27 +00:00
josteph
0228706f31 Revert "Lexical Cast: remove use of boost::mpl"
This reverts commit 88299f13869a8c32d859ec314356db6cb7e204a6.

(cherry-picked from commit 56e7b01ac4cdfd6cf51c36cc7bf1cac33391cc58)
2018-10-07 03:19:27 +00:00
josteph
c35ab93ff5 Revert "Fixup c57a175fee701b4d19c09653a5c9445b778d139e"
This reverts commit 9d0c70fb4861cec7a9f46443f1e59c5ace6ada5d.

That commit was wrong.
std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value
is not equivalent to
boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value
because the former is true not just for 'char*' and 'const char*' but
also for 'char'.

(cherry-picked from commit eacbc5f6959f57ff05451a2874a8e494ac3cb8db)
2018-10-07 03:19:26 +00:00
Charles Dang
1a41e8f7f4 Fixup c57a175fee701b4d19c09653a5c9445b778d139e
Turns out remove_const alone only removes the const from the pointer, not from the type
itself, so the expression wasn't returning true. This strips the pointer out before removing
const and matches against char instead of char*

(cherry-picked from commit a7e1ff85ed10fa56512583648727155a54a2b0cd)
2018-10-07 03:19:26 +00:00
Jyrki Vesterinen
872d1a9003 Changelog entry for commit a02100a0f1
(cherry-picked from commit fc3ca7a78371dd552f937091bf8929c434b3b8de)
2018-10-07 03:19:26 +00:00
Jyrki Vesterinen
4b84091c8b Implement saving MP chat message history (#1194, #2802)
(cherry-picked from commit a02100a0f15bd015c2322b7b528b0b9b60a1c678)
2018-10-07 03:19:26 +00:00
Charles Dang
6092803222 Revert "Utilized 2x xBRZ scaling for portraitless units in game dialog"
This reverts commit 601c67d970c2eacd2c59b340613502de8e8861fe and 98ed802290fb987fc106300a8b6414420e13ba2a.

(cherry-picked from commit 28b1ab286123a415398a3626601642bed51027f0)
2018-10-07 03:19:25 +00:00
Charles Dang
16643649ee Lexical Cast: remove use of boost::mpl
The code was checking that the From type was either char* or const char*. Replaced it
with an equality check against char* with the const stripped from From so both match.

(cherry-picked from commit c57a175fee701b4d19c09653a5c9445b778d139e)
2018-10-07 03:19:25 +00:00
pentarctagon
17d921f434 Make the C++17 build fail on warnings.
(cherry-picked from commit dd4b525c402879c9b67f799e634c5c172b49ee97)
2018-10-07 03:19:25 +00:00
pentarctagon
ada55a02e1 Attempt to fix UNUSEDNOWARN travis+gcc warnings.
(cherry-picked from commit 298f1dc9c1615196f73827e652ec2ea5f5ae5d9b)
2018-10-07 03:19:25 +00:00
pentarctagon
78c957d5ee Attempt to fix travis error.
(cherry-picked from commit 5dd5b6ec0b5d8272416ef7dea40a93b5fcccba5d)
2018-10-07 03:19:24 +00:00
pentarctagon
a0adab3fcc Adds a c++17 build using the pre-release Ubuntu 18.04.
Though given 00d87f8fe4078ffd84fcdc0d73fcc2104efef1e7 I would say this is better than nothing.

(cherry-picked from commit 33ad6be326c234b173d680ce34589464f88f8418)
2018-10-07 03:19:24 +00:00
Iris Morelle
1b94aad416 campaignd: Remove last remaining trace of the master_password functionality
(cherry-picked from commit 6d5f5d4299f41f54c979d2a5b785b4b26b9d2be2)
2018-10-07 03:19:24 +00:00
Iris Morelle
7a76fb9868 campaignd: Add 'hide'/'unhide' control FIFO commands and hidden= attribute
These are used to hide an add-on from listings and deny the author the
ability to upload or delete it or change its passphrase. This is
meant to be used when enforcing add-ons server rules that do not justify
deleting all of the add-on's metadata (for example, issues with icons or
descriptions).

(cherry-picked from commit 7d5d7ee7d429a9d650d300311d2bfeb363ca4686)
2018-10-07 03:19:24 +00:00
Iris Morelle
0ddddc5ee2 campaignd: Add 'delete' control FIFO command
(cherry-picked from commit 0475c349b801643a18372bb810ab0b6f4fd97fe8)
2018-10-07 03:19:23 +00:00
Iris Morelle
ddb0f29a99 campaignd: Refactor add-on deletion code into its own method
This changes the order in which the hook_post_erase hook (currently
unused in production and fully untested) is fired so it will be run
*before* displaying the confirmation message to clients. This might need
to be changed at a later point if the hook functionality ever gets used
again, but for now it'll do.

(cherry-picked from commit 957be8b53edbdce7706491bb4dd7f64de27784a9)
2018-10-07 03:19:23 +00:00
Charles Dang
33be7d5a8c 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 98ed802290fb987fc106300a8b6414420e13ba2a)
2018-10-07 03:19:23 +00:00
Charles Dang
723a8bf0a9 Changelog entry for 30257af
[ci skip]

(cherry-picked from commit 54cacf815de0923df8673ecb78a9034d09342b86)
2018-10-07 03:19:22 +00:00
Jyrki Vesterinen
d75a752c06 [heal_unit]: ensure that heal amount is an integer
(cherry-picked from commit 76ed49a45f3679050cf06e2ab6aa5ec072957572)
2018-10-07 03:19:22 +00:00
Jyrki Vesterinen
167ee61d34 Revert "Display amount healed as an integer in [heal_unit]"
This reverts commit 0294bd81b21be27e09f10d812fafa6bae7090002.

Changing display is unnecessary when the healed amount itself is forced
to be an integer (next commit).

(cherry-picked from commit f2284e2e79db5432039d0ac0a364d0982c7f9f71)
2018-10-07 03:19:22 +00:00
Charles Dang
ef4d9f570d Utilized 2x xBRZ scaling for portraitless units in game dialog
(cherry-picked from commit 601c67d970c2eacd2c59b340613502de8e8861fe)
2018-10-07 03:19:22 +00:00
Severin Glöckner
078d7662b1 finish renaming of the Horseman to Pathfinder
forward ported from 1.14, but without unit type alias

[ci skip]

(cherry-picked from commit ae0420108f9730561e0c100f4461ff82e34395b1)
2018-10-07 03:19:21 +00:00
Charles Dang
6ea71cf408 Drop Down Menu: allow right clicks to dismiss the window (fixes #2910)
(cherry-picked from commit 30257afd3f9725b1ac54610ef61d14d873057531)
2018-10-07 03:19:21 +00:00
Celtic Minstrel
017c3ca9cf Display amount healed as an integer in [heal_unit]
(cherry-picked from commit 0294bd81b21be27e09f10d812fafa6bae7090002)
2018-10-07 03:19:21 +00:00
Celtic Minstrel
c6f10ad794 fixup! Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit 7821f470c2c70eb0865f27b3baece9d0ce91afbc)
2018-10-07 03:19:21 +00:00
Celtic Minstrel
6d322cf63c fixup! Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit ea6578a87a4806500ec482cd179c565019c548fb)
2018-10-07 03:19:20 +00:00
Celtic Minstrel
48123469bc Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit ecc8785edbbcaa814502ccee6b2946da4242f53e)
2018-10-07 03:19:20 +00:00
Celtic Minstrel
b3b3a3c53d Remove redundant unused column in stats
(cherry-picked from commit ceea173eb488cbb124ff15c4ae19fa7fc00708a1)
2018-10-07 03:19:20 +00:00
Celtic Minstrel
558b9809e9 Swap count and name columns in statistics (fixes #2893)
(cherry-picked from commit ddd3222b3da26ec0cf6dd82adcd7d640ddc3b157)
2018-10-07 03:19:20 +00:00
Nils Kneuper
60a45b0f08 updated French translation
(cherry-picked from commit 6e85da54bcce88b686d9ab791949cce237ee9358)
2018-10-07 03:19:19 +00:00
Nils Kneuper
7a5e11bd3b updated Galician translation
(cherry-picked from commit c359b7a82966a6d4e3b72849479dc1d3e9aaff91)
2018-10-07 03:19:19 +00:00
loonycyborg
aba39b5d3b wesnothd: Fix UB caused by incorrect use of simple_wml::set_attr
(cherry-picked from commit 2e24d20236ff25a30cf9e238ee1214d8e4d32989)
2018-10-07 03:19:19 +00:00
Celtic Minstrel
d6052862df Fix two of the dialog functions not accepting translatable strings
(cherry-picked from commit 0327085d99cf98442b98c94145af7f91098bba7e)
2018-10-07 03:19:18 +00:00
Iris Morelle
60a91c4536 Remove stale include in test scenario causing errors
(cherry-picked from commit 0720065d7aa06c7c2f654dbfca5af5f4b8d79ffa)
2018-10-07 03:19:18 +00:00
Iris Morelle
c165f005b1 Changelog entry for MP lobby message fixes
[ci skip]

(cherry-picked from commit 529e551d9e1a2f7483da0784e3f9b2fd26e41ac1)
2018-10-07 03:19:18 +00:00
Iris Morelle
0cefba70b3 wesnothd: Use actual username when sending lobby messages too
(cherry-picked from commit 47b6b7f2a4f3d341415fb66265f902ff1103f3fb)
2018-10-07 03:19:18 +00:00
Charles Dang
04837d9100 Better changelog entry for the MP password fix
[ci skip]

(cherry-picked from commit 03d80a0b2b46470e19056fc5f818cf1cfe15bdf4)
2018-10-07 03:19:17 +00:00
ln-zookeeper
b3bf3862c7 UtBS: Removed obsolete slows note from Quenoth Scout
[ci skip]

(cherry-picked from commit cc4171e2077fcb086316bceb6a9bd0749f6f735b)
2018-10-07 03:19:17 +00:00
Celtic Minstrel
60d9bc27ae Fix #2894
(cherry-picked from commit 0f267d0ede3e8479e1e68a171e74b0cc420da51d)
2018-10-07 03:19:17 +00:00
loonycyborg
ef9c2b7e2c wesnothd: made server fill in sender when forwarding whispers
(cherry-picked from commit f5ab654760af1e1aba839979018e10ffd9d6ddbd)
2018-10-07 03:19:17 +00:00
Severin Glöckner
0ec5494b39 utbs: replace true by yes
[ci skip]

(cherry-picked from commit 5e1f6af8dd940e354d19b63963c2e1b851e9ff35)
2018-10-07 03:19:16 +00:00
Severin Glöckner
d0709c5ca1 utbs: change traits for higher unit types too,
because they are nowadays displayed in the help.
Also keep them sorted the same way as usual.

[ci skip]

(cherry-picked from commit 2e8f6c2a799331c1a1a98a9ee478d40e51e34268)
2018-10-07 03:19:16 +00:00
Severin Glöckner
fb1e7eb452 remove movetypes and abilities only used by old desert elves
[ci skip]

(cherry-picked from commit ea656a8cc795f41fcce41de2f8c5eb805d93cf4b)
2018-10-07 03:19:16 +00:00
ln-zookeeper
2c2b4da600 Updated changelog
[ci skip]

(cherry-picked from commit 33e924dc35fdbc6c32696d08d14beef9cd80893b)
2018-10-07 03:19:16 +00:00
Celtic Minstrel
dde49f05ea Editor: Refresh named locations list when map context changes (fixes #1023)
This solution is a bit of a hack, but odds are this code will be
majorly refactored in 1.15 anyway. The important thing is that
this works.

(cherry-picked from commit 8e4de9db67f533e98cd11235567b95a03cb9889a)
2018-10-07 03:19:15 +00:00
Charles Dang
f977cdc6cb Lobby Info: filter on game name first
It's more common to want a name.

(cherry-picked from commit 35590fd842ccaf6ff43769c88738813e0f06c1f5)
2018-10-07 03:19:15 +00:00
Charles Dang
c815fa1d25 Changelog entry for ab54b62
[ci skip]

(cherry-picked from commit 227c8ba20c24260a26c013d6f66f924af0c49632)
2018-10-07 03:19:15 +00:00
Charles Dang
3b3887d2e9 Attempt to fix non-required era being flagged for download
See #2747.

(cherry-picked from commit ab54b62553d5e6b3224ecf34c0e448eb58a972e9)
2018-10-07 03:19:15 +00:00
Charles Dang
2a6d9454de Replaced round_double and round_portable with std::round
std::round(double) uses the desired half-away-from-0 method.

(cherry-picked from commit 29fcbd053da63b790eb3b4fac32e204b054929d4)
2018-10-07 03:19:14 +00:00
pentarctagon
b32ce37de5 Allow setting c++17 in scons.
(cherry-picked from commit 7aeca70cb04f1990aeef0213b88ec80b0f4d24f8)
2018-10-07 03:19:14 +00:00