72007 Commits

Author SHA1 Message Date
pentarctagon
36eae8c771 Add option to build wesnoth with hardening options.
(cherry-picked from commit 6c5fc82b1baa0fc7b40beaccd975d595c5db728f)
2018-10-07 03:20:23 +00:00
loonycyborg
0b9a41cf1c wesnothd: add a check to prevent crash from accessing game owner not in player_connections_
(cherry-picked from commit 10ee2b2d29add3f45bcd06def0f41913dda47cfe)
2018-10-07 03:20:23 +00:00
gfgtdf
41aea16fb2 remvoe spammy debug message.
(cherry-picked from commit c58015671687c0b4a82e9bed36083df265aa85a8)
2018-10-07 03:20:23 +00:00
gfgtdf
ddd0a2e1b0 wb: fix moved becoming invalid after recruit is executed
(cherry-picked from commit 8bdccca7e373f805d1f2ecfe772151141a7015a9)
2018-10-07 03:20:23 +00:00
Charles Dang
5e65148c49 MP Lobby: kept the titles of reloaded games with vacant slots yellow
(cherry-picked from commit 717578b8a3a01242a9e9f8bf2363a1026c52cbae)
2018-10-07 03:20:22 +00:00
Charles Dang
30147885a5 Yet even more additional supplementary additive fixup
(cherry-picked from commit 7983b283ced47444fe4d012d923b97ea88eb34ba)
2018-10-07 03:20:22 +00:00
Charles Dang
a681d3b3ea Fixup 18afe08
(cherry-picked from commit 77922e54506a565eace2e0787444851f7e703522)
2018-10-07 03:20:22 +00:00
Celtic Minstrel
ebd2ea712a SotA: Avoid use of 'kids' to address Carcyn and Shynal
This is intended to address concerns raised by @beetlenaut that the two are not young enough to be referred to as 'kids'.

(cherry-picked from commit acb48da5d2115b086f436279dccdef482c89401d)
2018-10-07 03:20:22 +00:00
Charles Dang
9e2918d68e MP Lobby: base resolution selection on window width not height
[ci skip]

Height isn't the problem. The default lobby can display fine even at 600 px h. Width is
the problem the default layout faces at low resolutions, and it was quite odd to have a
really wide window use the low resolution layout, despite there obviously being enough
horizontal space to fit the sidebar.

(cherry-picked from commit 2f565b8e90e9b49a49635034524eb79d29e5f80d)
2018-10-07 03:20:21 +00:00
Charles Dang
0b0a4d97c0 MP Lobby: fixed every single user name being bold
If everyone's registered... no one is. :P

(cherry-picked from commit d789c2e7738e6c47c171660ffd43abcb3fc038a8)
2018-10-07 03:20:21 +00:00
Charles Dang
5c66a97f3c MP Lobby: decreased size of scenario/era name label
[ci skip]

Will slightly mitigate the issue of it potentially getting too long...

(cherry-picked from commit 08d0f6983fa6ac23d2335b8776d88715e5c073e2)
2018-10-07 03:20:21 +00:00
Charles Dang
f464cd20c7 MP Lobby: shifted game info icon to the left
[ci skip]

(cherry-picked from commit 0db17bbcf18ca3410ddfa162bb6d0ca656f97f80)
2018-10-07 03:20:20 +00:00
Charles Dang
a1f3c4f581 MP Lobby: added status text for full games
(cherry-picked from commit 819947f95f929516ea5ad9eb3ddcb3159e88cec1)
2018-10-07 03:20:20 +00:00
Charles Dang
e9bc7c9586 MP Lobby: restored Era info to main game display
Includes some slight spacing tweaks.

(cherry-picked from commit b17e9fa9b127110bf8b97a70d96e512ff64fdf2f)
2018-10-07 03:20:20 +00:00
Charles Dang
5129b2c42a Added some changelog entries for UtBS
[ci skip]

(cherry-picked from commit b947e7f63d4006119a7907c9e825b35855ff002f)
2018-10-07 03:20:20 +00:00
Charles Dang
74d5891ad0 MP Create Game: cap custom game names at 50 characters
[ci skip]

(cherry-picked from commit d9e3983e976b7b3ace600a48e79342f5b80a05d5)
2018-10-07 03:20:19 +00:00
Charles Dang
181cba88a5 GUI2/Size Lock: ensure formula sizes are recalculated as necessary.
This is similar to the change made for spacers in da5f00c2b671b79fcec8c36aa5316e1c7663a355.
It also fixes an issue with the MP Lobby chat box (and other such widgets that use formulas
for their fixed dimensions) where it would stay too small after a window resize (the chat
box formulas in all three dialogs it appears in are a percentage of window height).

(cherry-picked from commit 18afe08a7b0646aefdf30bebdabc46d2007208f4)
2018-10-07 03:20:19 +00:00
loonycyborg
6bb4d43c37 wesnothd: process wml commands one at a time in handle_read_from_player
as is done in rest of wesnothd. This also fixes crash from self-kick
due to it trying to continue processing looking for further tags
after /query kick kicked the user in quesion.

(cherry-picked from commit 6a310f0c79d002cbe53d9ee4f12b95a3b31c721b)
2018-10-07 03:20:19 +00:00
Iris Morelle
71f2c37b25 Fixed some issues with desynced changelogs and incorrect capitalization/order
[ci skip]

(cherry-picked from commit 3259ef75b935b0b1cfdb594d34435affcd546c35)
2018-10-07 03:20:18 +00:00
Iris Morelle
bd8176dc42 mp: Improve display of wesnothd client errors in general
Besides replacing the "End of file" error when getting disconnected from
the server under unexpected circumstances (e.g. because the server died)
with a translatable and more intuitive message, this also makes it so
other network error messages ("Connection refused", "Host not found",
etcetera) are displayed in the UI in a slightly clearer fashion, and in
an error dialog that must be dismissed with a click on a button, instead
of a transient message that can be easily missed due to an accidental
misclick.

Closes #3005.

(cherry-picked from commit c503c2ce35bc7d70fddc71daff70e31389615cf0)
2018-10-07 03:20:18 +00:00
ln-zookeeper
2dca2131b6 UtBS: Fixed some obsolete references to old elf units, weapons and hair
In S03, also removed one extra instance of the word "champion" from the same string.

(cherry-picked from commit 195d5a93db6fbd13f7bc2d41266652fb89549ef8)
2018-10-07 03:20:18 +00:00
loonycyborg
2a7aa40403 wesnothd: fix game host kick command kicking host itself instead of intended target
(cherry-picked from commit 40ae6c535615598d047d6682a81f0f8654b77b88)
2018-10-07 03:20:17 +00:00
ln-zookeeper
8575d8939b EI S11: Fixed units incorrectly costing upkeep after leveling up
(cherry-picked from commit d217dfc13c7c763e5a4812a6b731cdbfca2c483d)
2018-10-07 03:20:17 +00:00
Pentarctagon
c2f011e0da Fix cmake compiling with spaces in directory names.
(cherry-picked from commit 5fed276ad76d3ed14136ea3b40fd300daadfc541)
2018-10-07 03:20:17 +00:00
Charles Dang
b0b150cb5a MP Lobby: improved low-resolution layout
[ci skip]

* Removed unnecessary spacer line.
* Increased chat area height by 10% .

(cherry-picked from commit 195eb0ce73299489551e28024b6ae5f58a4d2025)
2018-10-07 03:20:17 +00:00
Severin Glöckner
e335e394ea Lobby mouseover: rename Gold to Gold per Village
(cherry-picked from commit 774471ba29161e390925388b8258bd04bc701fb2)
2018-10-07 03:20:16 +00:00
Charles Dang
00b908c368 MP Lobby: highlight the titles of MP games with vacant slots
(cherry-picked from commit 3e27ccaf1875408552e7aa32058e83b7a47adec5)
2018-10-07 03:20:16 +00:00
Charles Dang
ce79934810 MP Lobby: used specific colors instead of pango presets
The Pango presets are usually a little darker than we want, so this makes the colors POP.

(cherry-picked from commit 3d158130f4f33b518a5e562f85ebc5c182819743)
2018-10-07 03:20:16 +00:00
Charles Dang
2445e295e5 GUI2/Chatbox: fixed close button being shown for lobby tab when reloading log
Fixes #2992.

(cherry-picked from commit 65a554f41d39aa89e6e37b8cd73e1ae3063d6107)
2018-10-07 03:20:15 +00:00
Charles Dang
577fa7c0dd MP Lobby: removed individual Join/Observe buttons for each game
(cherry-picked from commit ffe71c5157c2df1f857b3ea999efdd533a514ecc)
2018-10-07 03:20:15 +00:00
loonycyborg
e53876067d wesnothd: fix crash from using reference to deleted object
(cherry-picked from commit b0cbe3adf75a366c6887c6318d40cb55bf02fceb)
2018-10-07 03:20:15 +00:00
gfgtdf
7c2df137be wb: fix moves for planned recruits
the for those moves get_unit() might return nullptr when it is
when the future map is not applied and some codes deduced from
that that the action is invalid. So we make sure that code does
not rely on get_unit().

(cherry-picked from commit 04d0dcdf655beefeda3a79d575669789ddc14e3b)
2018-10-07 03:20:15 +00:00
gfgtdf
620cb0351f wb: add debug info
(cherry-picked from commit c9df4bf02a4c5db66b4a29e0174ce1744a0088a6)
2018-10-07 03:20:14 +00:00
gfgtdf
c91b509be9 wb: cleanups & add debug message
(cherry-picked from commit 6cfe64e4da1b1b5ae0082befa2a31281ad480fee)
2018-10-07 03:20:14 +00:00
gfgtdf
1cd9894a24 wb: fix crash when using planning mode mode with dsu
fixes #1599 . we now automaticllay disable dsu when enabling planning mode

(cherry-picked from commit 4f161d889c87f610a565347656fd1695b60b1208)
2018-10-07 03:20:14 +00:00
gfgtdf
7b1a76a9a7 wb: update following moves when a recruit is executed
After a recruit action was executed the id of the unit was changed so we
need to update the unitid of all following actions on that unit

(cherry-picked from commit 2174bfc2156fd3af6ceb76e6bb939bc04c27c503)
2018-10-07 03:20:14 +00:00
gfgtdf
db62bdb7ac wb: refactor out get_unit() calls
there have been reported many assertion failures due to get_unit()
returning nullptr, so we try not to rely on get_unit() whenever
possible.

(cherry-picked from commit 5847615a774d8fa7f78be8fbef0ce8ca67fcd909)
2018-10-07 03:20:13 +00:00
gfgtdf
b999a1dc91 wb: fix nullptr assertion when log is enabled
(cherry-picked from commit 00f90eabe68dd2e41f7623bd759de8755d255105)
2018-10-07 03:20:13 +00:00
gfgtdf
5e9595e109 wb: more robust side_actions_container::erase
i don't really know why the old code had a special case for
`get_turn(next) != turn_of_position`, from what i see `turn_end(0)`
would basicially return the same value as `next`. The new code removes
that special case which resulted in assertion failures before (#1841)
and also consiers the case where `position` appears multiple times in
`turn_beginnings_`

(cherry-picked from commit 195913fc4be356bce2aa5d9b99bc2f64a4c3048b)
2018-10-07 03:20:13 +00:00
gfgtdf
9b27585315 wb: more robust side_actions_container::get_turn
the assumption

(turn_beginnings_[num] == it) => (get_turn(it) == num)

might be wrong in case that we have a turn with no actions, in which
case turn_beginnings_ contains duplicates and we actually want the upper
bound of (x <= it) in turn_beginnings_

(cherry-picked from commit ba6495c96addbc8279d580e261acce6b589a6eeb)
2018-10-07 03:20:13 +00:00
gfgtdf
6e943d6cb4 wb: fix future unit sprite missing
fixes #2124

(cherry-picked from commit 9277a6cf537863f9236e1d09b11c64903f50cecc)
2018-10-07 03:20:12 +00:00
Nils Kneuper
42cdcbcf93 updated Galician translation
(cherry-picked from commit c19590fc453c2ca1c3c68abe734a99d297db2ef6)
2018-10-07 03:20:12 +00:00
Iris Morelle
bd75565c7e Fix wesnoth(6) claiming the default log level is error
It's been warning since version 1.9.0.

[ci skip]

(cherry-picked from commit 006bd4d099f62a47ff548ecf4736a5f3a5322ea6)
2018-10-07 03:20:12 +00:00
loonycyborg
1767f81576 wesnothd: Fix remaining incorrect uses of simple_wml::get_attr instead of get_attr_dup
(cherry-picked from commit 688ae150ccb221a5d8d2e93421c8b165ec86a247)
2018-10-07 03:20:11 +00:00
doofus-01
3477893e49 fix TOD lighting for sleeping Kaleh, and make sure Zhul is facing the right way in opening scene
(cherry-picked from commit f880f402543b0d2d2239f154cf2619b926cf4e1f)
2018-10-07 03:20:11 +00:00
doofus-01
f0208e003b Bolas animations for Nym
(cherry-picked from commit ee04db61ebacc2906d6b2def1836016e89d3a0f0)
2018-10-07 03:20:11 +00:00
doofus-01
8b70014fc9 defense animations for shaman
(cherry-picked from commit de25b879245860469c88a8f491862a1a26688a80)
2018-10-07 03:20:11 +00:00
doofus-01
6965586d83 update to flanker and ranger base sprites
(cherry-picked from commit ad8bc761442a0be43fd8547d19aa816c028a1462)
2018-10-07 03:20:10 +00:00
doofus-01
ee8e82a402 quenoth shaman and druid sprites
(cherry-picked from commit 6ceedb40534cf3bdbcbb5493fffc4404cdda94e5)
2018-10-07 03:20:10 +00:00
doofus-01
ea410a39b7 edit first scenario to remove female gender specifications for units that have no such variation.
(cherry-picked from commit 961bcb861df35d2464d546283bc08c5932b9409e)
2018-10-07 03:20:10 +00:00