Commit graph

1813 commits

Author SHA1 Message Date
Reuben Rakete
18cc72e167 Add filter box to hotkey preferences 2019-01-06 18:04:08 +00:00
Edward Chernenko
0112a82a35 Fix typo in menu_button: active icon was used instead of pressed icon
Icon [short_arrow_left_25-pressed.png] exists, but is not used anywhere.
Widgets in [menu_button_default.cfg] and [multimenu_button_default.cfg]
were using [short_arrow_left_25-active.png] for the "pressed" state.
2019-01-02 19:10:35 +02:00
jostephd
21c20b951d
Help: Document campaign 'level' and 'difficulty'. (#3781) 2018-12-29 17:11:57 +00:00
jostephd
6a96b788ac
Recruit Unit: Add search functionality (#3787) 2018-12-23 16:42:37 +00:00
Celtic Minstrel
639787e1c9 Merge pull request #2562 from wesnoth/schema 2018-11-11 13:52:19 -05:00
Iris Morelle
f62758ee2d gui2/unit_recall: Change Recall button back to its correct label
Closes #3361.

(cherry picked from commit 1e449a193a)
2018-10-28 02:53:08 +00:00
Iris Morelle
119d5f3412 gui2/unit_recall: Fix i18n issues
The original commit adding the Rename Unit button marked two strings in
the C++ source for extraction without making them translatable.

Additionally, a string in the markup violates the string freeze. This
can be papered over by reusing the existing "Rename Unit" string. For
1.14.5 we'll use just "Rename" again.

(cherry picked from commit 306ebb9a87)
2018-10-28 02:53:07 +00:00
Charles Dang
3c3ef6ced6 Statistics Dialog: merge unit name and count labels
Makes it easier for translators to do something specific with this label if needs
be. I remember the reason the count (NUMx) label was moved prior to the name had
to do with language conventions too, so this should alleviate any other such issues.

Also made the name label default size instead of small.

(cherry picked from commit e9f7952408)
2018-10-28 02:53:06 +00:00
Charles Dang
95b4d4e0d7 Repair 66ab35f in the upwards direction
[ci skip]

(cherry picked from commit d724b1a71d)
2018-10-28 02:53:01 +00:00
Celtic Minstrel
ec849c97da Swap count and name columns in statistics (fixes #2893)
(cherry picked from commit 42ee12621b)
2018-10-28 02:52:58 +00:00
Jyrki Vesterinen
bd02a4f234 Remove a stray #endif
It got in by addicent in commit d9406979.
2018-10-27 21:37:50 +03:00
Charles Dang
d940697987 Preferences: tweaked FPS limiter option display
[ci skip]
2018-10-26 19:42:33 +03:00
Celtic Minstrel
3365aef28a Move GUI2 schema into the schema directory 2018-10-23 22:36:46 -04:00
Jyrki Vesterinen
cca79afe4b Add an option to disable FPS limiter
Cherry-pick of commit d7921f31b0.
2018-10-22 19:34:51 +03:00
josteph
9514298858 MP Create Game: Increase slider step size
Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680

(cherry-picked from commit 9abdc20841)
2018-10-07 03:25:21 +00:00
josteph
6cc6fe8527 WML [message]: Limit the text width for messages with portraits on both sides as already done for messages with one portrait.
(cherry-picked from commit 3809b64cf4)
2018-10-07 03:25:08 +00:00
josteph
b7964a1002 WML [message]: Add left padding when the portrait is shown on the right.
The text is now shown at exactly the same place regardless of which side
the portrait is on.

Fixes #1938.

(cherry-picked from commit fc9e5f0484)
2018-10-07 03:25:08 +00:00
jostephd
6800ccd95a Game Load: Show list of enabled modifications (#3495)
(cherry-picked from commit 6f670556a1)
2018-10-07 03:24:37 +00:00
Martin Hrubý
45c1f7a852 Fix localised Multiplayer causes preferences window use scrollbar #2855
(cherry-picked from commit be0bd05ab0)
2018-10-07 03:24:05 +00:00
gfgtdf
66c0753000 fix game crashing when showing a too large tooltip
previously the game would go into an infinite loop at
https://github.com/wesnoth/wesnoth/blob/1.14.4/src/gui/widgets/window.cpp#L1046
when a tooltip doesn't fit on screen, this could in particular happen in
the mp lobby when hovering over the 'i' of a game that uses a ridiculous
amount of modifications.

I currently don't see any case where the game is actually able to 'fix'
a bad height that was reported from reevaluate_best_size. so i just
disable reevaluate_best_size for floating tooltips.

If there exists such a case, an alternative fix could be to change the
reevaluate loop in window::layout to also stop when a new iteration
returned the same size as the previous iteration.

(cherry-picked from commit 936516c83b)
2018-10-07 03:23:56 +00:00
Łukasz Hryniuk
b401d39cfa gui2: allow renaming units in the Recall dialog
(cherry-picked from commit 349b18b216)
2018-10-07 03:23:35 +00:00
Iris Morelle
34545ba9e4 gui2/preferences: Use curly quotes in quoted text in tooltips
[ci skip]

(cherry-picked from commit b8b403185e)
2018-10-07 03:23:15 +00:00
gfgtdf
5a39a62118 allow non hosts to change factions later.
previously players had to leave an rejoin the game to change their faction.
this was most annoying in coop games where you want might want to choose
your faction in consultation with the other players. Also you previously could
not even checkout the different available factions again after you joined
the game.

(cherry-picked from commit 5ba389111e)
2018-10-07 03:23:03 +00:00
Charles Dang
39edd7c0c6 Preferences: added a mention of the in-game accelerated speed toggle
[ci skip]

(cherry-picked from commit 98ddc311fc)
2018-10-07 03:23:02 +00:00
Charles Dang
ff7f3c06a0 Preferences: shifted the Skip AI Moves button around
[ci skip]

Makes it clear it's not intrinsically tied to the Accelerated Speed factor.

(cherry-picked from commit 10e663ed6c)
2018-10-07 03:23:02 +00:00
Charles Dang
4c8788f62a Preferences Dialog: drop characters_per_line from hotkey list
[ci skip]

For some reason, this made the entire page stack thinner than it should be. I have
no idea why, and I'm not sure wrap= here instead does anything (namely, wrap if it
gets too long), but it's better than what was happening before.

(cherry-picked from commit cb7a679142)
2018-10-07 03:23:02 +00:00
Charles Dang
92b95d7a44 Unit Advance: left-align header
[ci skip]

(cherry-picked from commit 893860321a)
2018-10-07 03:22:56 +00:00
josteph
9f2cbad96f MP Faction Select dialog: Show leader unit details.
If the leader hasn't been discovered, the "Unknown Unit" topic will be shown.

Fixes #1491

(cherry-picked from commit a8f83f6e68)
2018-10-07 03:22:50 +00:00
josteph
bf8cd9f90b GUI: Fix the direction of the arrow on a listbox sort column header.
This affects the files list in the the "Load Game" dialog.

(cherry-picked from commit 8481927a5a)
2018-10-07 03:22:49 +00:00
Charles Dang
8137e9a454 GUI2/Chatbox: limit input to 256 characters (fixes #3267)
[ci skip]

(cherry-picked from commit c5d6f695dd)
2018-10-07 03:22:47 +00:00
josteph
01bd2af9ae Preferences: Improve label and tooltip of 'Accelerated speed' slider.
(cherry-picked from commit d95efd3409)
2018-10-07 03:22:44 +00:00
Charles Dang
98299d56ef End Credits: reduced text surface size by 42%
[ci skip]

Really no reason for the text area to grow since the text is set in pre_show and
therefor the widget is always the right size. >_<

(cherry-picked from commit 01d37ca795)
2018-10-07 03:22:36 +00:00
Charles Dang
1e1839de3d Statistics Dialog: merge unit name and count labels
Makes it easier for translators to do something specific with this label if needs
be. I remember the reason the count (NUMx) label was moved prior to the name had
to do with language conventions too, so this should alleviate any other such issues.

Also made the name label default size instead of small.

(cherry-picked from commit 142a2f20ca)
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
a5b8053340 Campaign Dialog: renamed Deterministic Mode label to "Save random seed"
[ci skip]

This better conveys its behavior, especially with the introduction of the hidden PRNG
preference.

(cherry-picked from commit bf92dbbfd2)
2018-10-07 03:22:11 +00:00
Charles Dang
075d793539 Campaign Difficulty: consolidated both lines into a single label
(cherry-picked from commit f72f89f4d5)
2018-10-07 03:21:57 +00:00
Charles Dang
886156b0fe Campaign Difficulty: rearranged entry layout
(cherry-picked from commit 67530c4375)
2018-10-07 03:21:45 +00:00
Charles Dang
2873ad1c7e MP Lobby: removed manual player list sorting
It didn't make much sense to have these since there's really no situation you'd want
the "default" sorting order, which is however the server decided to send the list.

(cherry-picked from commit e754e64987)
2018-10-07 03:21:44 +00:00
Charles Dang
b67fd6d96d Fixup 9bf7a4c (WFL comment syntax)
[ci skip]

(cherry-picked from commit c48a8e7edd)
2018-10-07 03:21:41 +00:00
Iris Morelle
34c9a2aedc gui2/preferences: Add margin around the version info button
[ci skip]

(cherry-picked from commit f30634842e)
2018-10-07 03:21:40 +00:00
Iris Morelle
bcf56aac3a gui2/preferences: Add version info button
Also simplifies the layout of the bottom-most row of the dialog a bit.

(cherry-picked from commit e8c803d426)
2018-10-07 03:21:40 +00:00
Charles Dang
ef09c1d10a GUI2/Message: tweaked Magic Numbers to fix layout failure with large portraits
[ci skip]

Fixes #2912

(cherry-picked from commit 9bf7a4c8fb)
2018-10-07 03:21:39 +00:00
Charles Dang
e0653e7d54 Preferences Dialog: fixed inconsistent label sizes in hotkeys list
(cherry-picked from commit 26c8860b6c)
2018-10-07 03:20:36 +00:00
Charles Dang
7b4b14eb32 MP Lobby: bunch of small UI and text formatting tweaks
(cherry-picked from commit 58ebc064e9)
2018-10-07 03:20:36 +00:00
Charles Dang
650121a8de MP Lobby: removed Refresh button
I'm not 100% sure about this change, but I think its presence was rather confusing and
it (hopefully) shouldn't ever be needed.

(cherry-picked from commit fe10bc0315)
2018-10-07 03:20:32 +00:00
Charles Dang
d90c6d9d34 * MP Method Selection: clarified the account requirement for the official server
Also sets the tooltip type for this dialog back to bottom-of-the-screen ones instead
of floating ones. And some formatting cleanup to the C++.

(cherry-picked from commit 851b28e24b)
2018-10-07 03:20:28 +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
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 08d0f6983f)
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 0db17bbcf1)
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 b17e9fa9b1)
2018-10-07 03:20:20 +00:00