71776 Commits

Author SHA1 Message Date
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
pentarctagon
83a2457dd8 Add a check to fail the job if compiling takes too long.
The intent behind this is that, if there most likely wouldn't be enough time left to complete the unit tests anyway, then just fail the job after compiling so the cache can be updated.  Otherwise, if the unit tests were run and the job timed out, then the cache would not be uploaded at all and the next time the job ran it would be from scratch again.

(cherry-picked from commit 5d970e40cd43a23a8d1b8198e962f198fc9282b0)
2018-10-07 03:19:14 +00:00
pentarctagon
b2cca08257 Allow setting a sanitizer to use.
Note: UBSan at least does seem to take a fairly significant amount of extra time to compile and run the WML tests with.

(cherry-picked from commit 92f74c39f6aedc10bd04f1cf6dc9144fb35e3a19)
2018-10-07 03:19:14 +00:00
pentarctagon
a07b847181 Allow setting EXTRA_FLAGS_RELEASE to something other than -O0.
(cherry-picked from commit 2ed9d2c0c4d1d079190ff5bd2a8a287f9076d198)
2018-10-07 03:19:13 +00:00
pentarctagon
4bb16f25a7 Make LTO controllable via travis env variable.
(cherry-picked from commit 66caa190f6dcde039cc5cb73e4f43a061aef43b8)
2018-10-07 03:19:13 +00:00
Charles Dang
58a61af5f9 Removed duplicate config_key_type alias
This isn't used in config_attribute_value.*pp but rather in config.*pp.

(cherry-picked from commit 9977addd64505b3042cd2a2a9e26f2a7a84acd5c)
2018-10-07 03:19:13 +00:00
Charles Dang
1f8ba287dd Expand NORETURN, enable C99 unconditionally on MSVC
[[noreturn]] is supported on all the compilers we support. Still need to decide
the exact minimum versions and figure out what to do with DEPRECATED and FALLTHROUGH,
so leaving those for now.

And since we require VS 2015 and up we can enable C99 unconditionally.

(cherry-picked from commit 96681151f083bb25a3ddb3301083241e36fd6789)
2018-10-07 03:19:13 +00:00
Charles Dang
68f066d94a Removed bind_void
This is no longer needed with the compilers we support. It is needed on VS 2013, but
we dropped that. Don't know when GCC or Clang stopped needed it (if they ever did).

I'm guessing the "function that returns a value cannot be bound in a function type
that returns void" behavior wasn't an intentional design. Additionally, I don't believe
point 1 raised in the accompanying comment has ever been true... if so, pretty sure
we wouldn't have been able to build at all.

Also removed unnecessary global.hpp include from functional.hpp.

(cherry-picked from commit 17fc9d71dbd933fa2e37c8fd9aed52a4e2fb5735)
2018-10-07 03:19:12 +00:00
pentarctagon
34a18a7692 Remove boost-thread from dockerfile.
(cherry-picked from commit 52f8e8233c99c214d7409fd9f0b2cd4056590255)
2018-10-07 03:19:12 +00:00
Martin Hrubý (hrubymar10)
13e402e031 Remove Boost thread from Xcode project
(cherry-picked from commit 6314c6ab05a2ac89efac2313c285c7aa5c4b2b29)
2018-10-07 03:19:12 +00:00
Martin Hrubý (hrubymar10)
116a897163 Update link to new MacCompileStuff repo
(cherry-picked from commit 68c1dbeab2453f41cfc06742becf149a2487694b)
2018-10-07 03:19:12 +00:00
Nils Kneuper
7969aaaf00 updated Polish translation
(cherry-picked from commit cff478f9d386afcb18e3bd5ed06149c29c4b356e)
2018-10-07 03:19:11 +00:00
Nils Kneuper
87bf4e3fd6 updated Italian translation
(cherry-picked from commit 6034cc50d1559a9776be9e4b4882c449b7c64afe)
2018-10-07 03:19:11 +00:00
Jyrki Vesterinen
00dff3f1d3 Changelog entry for commit 82e04ab7611b8c8458e70f66c49a8032e1c8469c
(cherry-picked from commit c5802cdcda42f068aa2a7372f864cc8f1522568a)
2018-10-07 03:19:11 +00:00
Jyrki Vesterinen
c6b7586f6f Fix #2850: [modify_side] share_vision=yes doesn't do anything
Thanks to @gfgtdf for the suggested fix that works well.

(cherry-picked from commit 82e04ab7611b8c8458e70f66c49a8032e1c8469c)
2018-10-07 03:19:10 +00:00
Charles Dang
32da54b059 Removed Boost Thread as a built-time dependency
We use std::thread now.

(cherry-picked from commit 9de7aff9044b1aae7fc56c4b78a400d93c0f6750)
2018-10-07 03:19:10 +00:00
Charles Dang
e22a48046a Removed last boost/thread.hpp include
Locale doesn't rely on boost, so it must have been some other issue in Boost 1.60
that was incidentally fixed by including that file. If anyone ever happens to build
with 1.60 again we can revisit this.

For the record, there are no issues with VS 2017 and Boost 1.66.

(cherry-picked from commit 7cf93413797c73e6ca33e22a615897ffbec42cdb)
2018-10-07 03:19:10 +00:00
loonycyborg
b6c843757b Fix "host networked game" option
It was broken by b95c9996bf435daa4d7e64fd1ef41425ac182b95 because
ignoring SIGCHLD makes it impossible to query exit status of wesnothd
subprocess. Fix this by spawning a thread to wait for the browser
instead of ignoring SIGCHLD.

(cherry-picked from commit 846bf8f208ae41381e133e96b24e6b9876ea2a01)
2018-10-07 03:19:10 +00:00
Charles Dang
1dd00c3441 Game Load: added a convenient button in Load Game to open your saves folder
(cherry-picked from commit 802bbe8cdccacb225ea02a8f8b4240b7172549ed)
2018-10-07 03:19:09 +00:00
Severin Glöckner
0c6322230a update 2nd stunned event as well with additions from 1.13.2
[ci skip]

(cherry-picked from commit 469488d9815a1dc243512396b5c644918dc77d60)
2018-10-07 03:19:09 +00:00
Charles Dang
20493dc07c ANL: removed unused macro (closes #2878)
[ci skip]

(cherry-picked from commit 90d45dcf074aaf6e2f118abba81103999a17521a)
2018-10-07 03:19:09 +00:00
Charles Dang
98c61118d5 Refactor out custom wesnothd_connection_ptr class again
I originally did this in 699047766a8852014df20c44d5ed84dadb37015e and then reverted it in
08a866dc20e678602f65f0cdedb21fb28a0bfa8c due to @gfgtdf pointing out the object was never
actually destroyed since io_service::stop was never called (issue #1927).

This new method foregoes the custom wrapper class and instead waits for the worker thread
to terminate in the wesnothd_connection dtor. The use of the wrapper class is also why using
thread::detach alone worked (@jyrkive) and using join did not.

Additionally, the ptr alias is now of a unique_ptr instead of a shared_ptr.

I have verified that the connection dtor is actually called. This new method makes it clearer
what's actually going on.

(cherry-picked from commit acc3fe890611b54c8493acafc33f1e78832b65dc)
2018-10-07 03:19:09 +00:00
Severin Glöckner
28c58d0e21 remove unneded keys
[ci skip]

(cherry-picked from commit 533c7e9822b097fd8cc7502d8362d0345b29d022)
2018-10-07 03:19:08 +00:00
Severin Glöckner
b9ea1961b1 INSTALL had been renamed to INSTALL.md
[ci skip]

(cherry-picked from commit 7d427aedee8ff5e8cec2866e3aee2d041ecc1a50)
2018-10-07 03:19:08 +00:00
Jyrki Vesterinen
cb3ddc368b Hotkey manager: drop duplicate commands
We use both SDL_KEYDOWN and SDL_TEXTINPUT events for hotkeys. It's possible
for both events (caused by the same keypress) to trigger the hotkey command
and we don't want that. Hence, let's drop duplicate commands.

Fixes #1736.

(cherry-picked from commit 8667e5bbdd3d2a92e966a15f12a3753b9e3c283f)
2018-10-07 03:19:08 +00:00