Commit graph

420 commits

Author SHA1 Message Date
Jyrki Vesterinen
7cefbac1eb Changelog entry for commit 8fa3f6a6d4
(cherry-picked from commit 9db47334a9)
2018-10-07 03:20:45 +00:00
Charles Dang
c033bffb33 Changelog: fixed inaccuracy
[ci skip]

(cherry-picked from commit 05774a3df5)
2018-10-07 03:20:43 +00:00
Charles Dang
3b5a9d2994 Fixed a crash when using certain invalid color= values
The specific case that brought this to our attention was color=100. In case such values
are used, the color reverts back to the default color for that side, as before.

The new codepath (team::get_side_color_id_from_config) is essentially the same as the old
one but more robust (range checking, for example, the lack of which was causing the crash
before).

(cherry-picked from commit 4c937c10c7)
2018-10-07 03:20:43 +00:00
Iris Morelle
23167a3634 Add changelog entries for the workaround for issue #3050
[ci skip]

(cherry-picked from commit 92812588b3)
2018-10-07 03:20:42 +00:00
Iris Morelle
a4f7f5c37c wam: Allow using embedded data URIs as add-on icons
[ci skip]

(cherry-picked from commit 4335bedeff)
2018-10-07 03:20:41 +00:00
ln-zookeeper
a4cc22f58a Updated changelog
(cherry-picked from commit f8a02e5e6d)
2018-10-07 03:20:40 +00:00
Iris Morelle
c92dd096c5 Update changelog for #3019
[ci skip]

(cherry-picked from commit 9850d3fa9c)
2018-10-07 03:20:30 +00:00
Iris Morelle
87c19293b7 Update changelog for MP server stuff from me and loonycyborg
[ci skip]

(cherry-picked from commit 622b1936bc)
2018-10-07 03:20:30 +00:00
Iris Morelle
e2acbffdea gui2/unit_attack: Only display active specials on the weapons list
This fixes issues reported on the forums where the weapons list now
includes weapon specials even when they aren't active, a regression from
1.12.x.

Closes #3033.

(cherry-picked from commit d727cf2c99)
2018-10-07 03:20:28 +00:00
mattsc
385f86bdbd changelog entry for custom AI for AToTB S2
(cherry-picked from commit a82971e48d)
2018-10-07 03:20:27 +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 2f565b8e90)
2018-10-07 03:20:21 +00:00
Charles Dang
e9bc7c9586 MP Lobby: restored Era info to main game display
Includes some slight spacing tweaks.

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

(cherry-picked from commit b947e7f63d)
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 d9e3983e97)
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 da5f00c2b6.
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 18afe08a7b)
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 3259ef75b9)
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 c503c2ce35)
2018-10-07 03:20:18 +00:00
ln-zookeeper
8575d8939b EI S11: Fixed units incorrectly costing upkeep after leveling up
(cherry-picked from commit d217dfc13c)
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 195eb0ce73)
2018-10-07 03:20:17 +00:00
Charles Dang
00b908c368 MP Lobby: highlight the titles of MP games with vacant slots
(cherry-picked from commit 3e27ccaf18)
2018-10-07 03:20:16 +00:00
Charles Dang
577fa7c0dd MP Lobby: removed individual Join/Observe buttons for each game
(cherry-picked from commit ffe71c5157)
2018-10-07 03:20:15 +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 006bd4d099)
2018-10-07 03:20:12 +00:00
Jyrki Vesterinen
d8fa1b945c Changelog entry for commit 93f956ed4c
(cherry-picked from commit f074f812ca)
2018-10-07 03:20:08 +00:00
Charles Dang
066894c188 Changelog entry for the misleading tooltip text fix
[ci skip]

(cherry-picked from commit f33111e86b)
2018-10-07 03:20:07 +00:00
Iris Morelle
450092033a gui2/log_settings: Permit disabling logdomains (log level -1)
(cherry-picked from commit ae5ab22b1a)
2018-10-07 03:19:55 +00:00
Charles Dang
5cac72b91f More changelog updates
[ci skip]

(cherry-picked from commit f3a77bf310)
2018-10-07 03:19:52 +00:00
Charles Dang
e2cbd13a32 Changelog entry for the Dark Forecast fix
[ci skip]

(cherry-picked from commit 4219e13ac5)
2018-10-07 03:19:52 +00:00
Charles Dang
3cca6e5dc8 Various changelog updates
[ci skip]

(cherry-picked from commit a85b14cfb7)
2018-10-07 03:19:45 +00:00
Nils Kneuper
bc641501a9 updated Japanese translation
(cherry-picked from commit b0f76a7d4d)
2018-10-07 03:19:42 +00:00
Iris Morelle
2d7f6cd4c7 Replace a few instances of "mermen" with "merfolk" in core descriptions
These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").

See issue #2940.

[ci skip]

(cherry-picked from commit 14ec9954f1)
2018-10-07 03:19:39 +00:00
Iris Morelle
60c356112c Change the plural race name for merfolk to Merfolk
See issue #2940.

[ci skip]

(cherry-picked from commit 296894c515)
2018-10-07 03:19:38 +00:00
Charles Dang
0b0dbe24ec changelog entry for the UtBS portraits
[ci skip]

(cherry-picked from commit 6b359268f0)
2018-10-07 03:19:33 +00:00
Charles Dang
31e6c40653 Removed OpenMP-related code
After some discussion, we concluded that this code was unmaintained, not even used in
some places (display.cpp, units/frame.cpp), leaving the only area that really used it
at all the image surface cache. Considering there was never really a conclusive benchmark
of its benefits and because said surface cache will be used a lot less going forward,
we're just removing it and simplifying everything for everyone.

Closes #1260 since it's now irrelevant.

(cherry-picked from commit 3792612fb7)
2018-10-07 03:19:30 +00:00
pentarctagon
96f8b51383 Re-add boost-thread to INSTALL and changelog.
(cherry-picked from commit f4db76fe0f)
2018-10-07 03:19:30 +00:00
Nils Kneuper
08f493213d updated German translation
(cherry-picked from commit 5bb1089abc)
2018-10-07 03:19:29 +00:00
Iris Morelle
ce675dd1db gui2/title_screen: Make Version label formatted and translatable
Closes #2914.

This doesn't break the string freeze since it reuses a format string
from the same textdomain required by gui2/game_version for the exact
same purpose.

(cherry-picked from commit fa15142150)
2018-10-07 03:19:29 +00:00
Nils Kneuper
2d8bdac955 updated Slovak translation
(cherry-picked from commit ef7c0a7b64)
2018-10-07 03:19:28 +00:00
Jyrki Vesterinen
872d1a9003 Changelog entry for commit a02100a0f1
(cherry-picked from commit fc3ca7a783)
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 601c67d970 and 98ed802290.

(cherry-picked from commit 28b1ab2861)
2018-10-07 03:19:25 +00:00
Charles Dang
723a8bf0a9 Changelog entry for 30257af
[ci skip]

(cherry-picked from commit 54cacf815d)
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 601c67d970)
2018-10-07 03:19:22 +00:00
Celtic Minstrel
48123469bc Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit ecc8785edb)
2018-10-07 03:19:20 +00:00
Celtic Minstrel
d6052862df Fix two of the dialog functions not accepting translatable strings
(cherry-picked from commit 0327085d99)
2018-10-07 03:19:18 +00:00
Iris Morelle
c165f005b1 Changelog entry for MP lobby message fixes
[ci skip]

(cherry-picked from commit 529e551d9e)
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 03d80a0b2b)
2018-10-07 03:19:17 +00:00
ln-zookeeper
2c2b4da600 Updated changelog
[ci skip]

(cherry-picked from commit 33e924dc35)
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 8e4de9db67)
2018-10-07 03:19:15 +00:00
Charles Dang
c815fa1d25 Changelog entry for ab54b62
[ci skip]

(cherry-picked from commit 227c8ba20c)
2018-10-07 03:19:15 +00:00
Nils Kneuper
87bf4e3fd6 updated Italian translation
(cherry-picked from commit 6034cc50d1)
2018-10-07 03:19:11 +00:00
Jyrki Vesterinen
00dff3f1d3 Changelog entry for commit 82e04ab761
(cherry-picked from commit c5802cdcda)
2018-10-07 03:19:11 +00:00