79946 Commits

Author SHA1 Message Date
Steve Cotton
295abbb911 CMake: update the .po files before generating stats about them 2021-11-24 13:10:08 +01:00
Wedge009
c1bca269cb Capitalise 'Sceptre of Fire'.
[ci skip]
2021-11-24 13:53:18 +11:00
Steve Cotton
b8400b5b72 ui: Fix 800x600 theme's sidebar tooltips
Two changes in the theme config for 1024x600, which is inherited by the config
for 800x600. Both are the same line but otherwise only loosely related to each
other; together these fix issue #6264, which was that trigger areas for some
tooltips overlapped.

Reduce the width for the unit's name, thus giving the side-flag and side-number
(which get the remaining horizontal space) enough space to display themselves.
128 pixels wide is the same as the name gets in larger themes, even though
those larger themes use larger font sizes. This means that the side number
doesn't get ellipsed, at least for games with up to 9 sides, with the
side-effect that the tooltip can be displayed when hovering over the flag.

Move the name, and thus the flag and side-number down by 1 pixel, so that they
don't overlap with the tooltip trigger areas for movement points and terrain
defense. The name's location is based on the placement of `unit-box-botleft`;
the theme for larger screen-sizes similarly adds 5 pixels of padding because
the `unit-box` is only 72x72 for the image, and the text areas for movement
points and defense go lower than that.

(cherry picked from commit 0d4854d5ffdcf265065d9519e2537dce14c8406e)
2021-11-24 00:38:49 +01:00
Pentarctagon
232cb02dfd
Typo fix. 2021-11-22 21:57:51 -06:00
Wedge009
10e99924b5 Capitalise references to the Academy of Magic on Isle of Alduin, for consistency.
Resolves #6310.

[ci skip]
2021-11-23 14:08:02 +11:00
Wedge009
dcb127ffee Avoid unnecessary wording.
[ci skip]
2021-11-23 13:08:58 +11:00
Pentarctagon
18db5fab1c
Add luacheck to docker image. 2021-11-22 18:10:18 -06:00
Wedge009
5cda4f8089 Correct scenario count for SoF.
Looks like scenario '2p5' introduced in #4609 wasn't included in the scenario count.

[ci skip]
2021-11-22 19:35:27 +11:00
fujimo-t
6b52e1f76a Replace std::regex by boost to temporary workaround for Mingw-w64's bug
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98723
2021-11-22 09:22:34 +11:00
Wedge009
3922d04b44 Restore word mistakenly removed in 19a42e3ead717dc1808162168585abe8755df4a4.
[ci skip]
2021-11-21 22:07:37 +11:00
Nils Kneuper
376bb10cd4 updated British English translation 2021-11-20 09:57:38 +01:00
Steve Cotton
c449232730 UtBS: Use a lower-case letter for "taurochs"
It's the name of a species, so lower-casing it is consistent with #6067.
2021-11-20 00:54:53 +01:00
Pentarctagon
1c8b0817fc
Cleanup some names. 2021-11-18 17:20:09 -06:00
Pentarctagon
76488dc417 Attempt to trim down the CI after getting caught in github's automated platform abuse tool.
Removed:
* Two linux jobs - now only two combinations of the gcc/clang + scons/cmake matrix are run.
* Two macOS jobs - the Release configuration is now only run on ARM, and the Debug configuration is only run on Intel.

Also pinned vcpkg to a particular commit so it doesn't ignore the cache when new versions of dependencies come out. This does mean though that when dependencies or dependency versions change that the vcpkg commit and the cache ID will need to be manually updated. And while it's *probably* safe to have stable and master share the same vcpkg cache, this may become problematic if their dependencies and/or versions become incompatible.
2021-11-18 17:08:22 -06:00
Pentarctagon
1f6bf4c203 Upload artifacts that could be used for releases.
Also don't upload things anymore that aren't being used.
2021-11-18 12:32:17 -06:00
Pentarctagon
867965742a Add --simple-version command line option.
This option automaticaly implies --nobanner as well as displays nothing else but the version.
2021-11-18 12:32:17 -06:00
max-torch
78f37713f5 Define KeyboardInterrupt Exception Handler in wmlxgettext
Note: The signal class object was used to avoid wrapping the entire main routine in a try...except clause.
2021-11-17 23:08:37 +01:00
max-torch
e35690c8f9 Edit wmlscope KeyboardInterrupt Displayed Message 2021-11-17 23:08:37 +01:00
max-torch
74d8ac9e77 Edit wmllint KeyboardInterrupt Displayed Message 2021-11-17 23:08:37 +01:00
max-torch
56dc9830dc Define KeyboardInterrupt Exception Handler in wmlindent
Note: The signal class object was used to avoid wrapping the entire main routine in a try...except clause.
2021-11-17 23:08:37 +01:00
Pentarctagon
178efca3a3
static_cast > const_cast. 2021-11-17 15:22:38 -06:00
Pentarctagon
a60024a805
Fix old style cast warning. 2021-11-17 12:06:03 -06:00
Wedge009
76fda0bf3d Refactor the boarding events for TRoW S8 Clearwater Port.
Resolves #6298.
2021-11-17 22:53:56 +11:00
Descacharrado
49e43694f4
HttT S05b - Added cracked temples (#6279)
* Added cracked temples to core and to S05b in HttT

* Compressed png files
2021-11-17 22:53:31 +11:00
Wedge009
541f0a1e73 Add po hints where self-referential troll names have been replaced with variables.
[ci skip]
2021-11-17 22:52:34 +11:00
Wedge009
4a3ddfb143 Refactor handling of allies in UtBS. Resolves #6158.
With four potential allies in the campaign, there is a lot of dialogue duplication. This refactoring attempts to consolidate the text.
Additionally, the ally ID was recorded in the variable ally_name which can be confusing, so rename it to ally_id instead.
2021-11-17 22:52:34 +11:00
Charles Dang
508c9406f1 Made more use of mp::send_to_server 2021-11-16 21:50:06 -05:00
Charles Dang
8a9265c8fc MP: renamed yeet_to_server 2021-11-16 21:40:58 -05:00
Pentarctagon
05dd35f1f8
Fix variable type to match query return type.
No idea why this is suddenly flagged now, though it is correct.
2021-11-16 16:43:10 -06:00
Pentarctagon
63af26257e
Fix whitespace. 2021-11-16 15:22:08 -06:00
Pentarctagon
5fa034bbd8
Changelog update. 2021-11-15 11:51:50 -06:00
Pentarctagon
8367598b32 Check whether to display lobby joins in the game creation screen.
Fixes #6234
2021-11-15 11:46:31 -06:00
Charles Dang
60c6e72921 MP/Alerts: made part of mp namespace 2021-11-15 02:42:20 -05:00
Charles Dang
1f9aeceb11 AI/Config: static inline 2021-11-15 02:40:05 -05:00
Charles Dang
53a4f6532f MP/UI Alerts: formatting, cleanup, and fixed incorrect preference ID
The wrong pref id ("player_enters" as opposed to "player_joins") was being checked in the player_joins function.
The latter is referenced in the MP Alerts dialog, the former nowhere.

Also kept the actual strings in one place so this doesn't happen again.
2021-11-15 01:20:40 -05:00
Charles Dang
bffe300ba1 wesnothd: avoid unnecessary copy of new_player object 2021-11-14 23:28:28 -05:00
Charles Dang
a111f83e6e GUI2/Group: pass the associated value of a member to the value change callback 2021-11-14 23:10:52 -05:00
Charles Dang
4bcc8e7cbe Lobby Info: consolidated a function 2021-11-14 22:03:37 -05:00
Charles Dang
049bfc113b Preferences: made lobby_joins a scoped enum
Also used it for relevant function return types/argument types instead of int
2021-11-14 22:03:03 -05:00
Charles Dang
f40a39eae1 GUI2/Group: fixed compile error when specializing with a scoped enum
Should maybe find a better way to have it actually print the value but I can't think of a good general way to do it.
2021-11-14 22:02:27 -05:00
V N
f0c9f1e2de
Merge branch 'fix-multi-account-password-saving' 2021-11-13 18:14:33 +01:00
V N
701bb5a13e
Fix multi-account password saving
Fixes GH-6288, and hopefully makes the code
more readable / easier to understand.
2021-11-13 18:13:43 +01:00
Nils Kneuper
86e35ddf5b updated Czech translation 2021-11-13 10:12:43 +01:00
Nils Kneuper
da35360a51 updated Portuguese (Brazil) translation 2021-11-13 10:11:30 +01:00
Nils Kneuper
5b351acab1 updated Japanese translation 2021-11-13 10:10:26 +01:00
Steve Cotton
323ce6ec26 Show id in "skipping duplicate variation" warning
Add a useful identifier to the message

    error config: Skipping duplicate unit variation ID: ''

This warning is generally shown because the variation_id is completely
missing, and so the message appeared as above, without any hint of which
unit was causing the problem.

In contrast to 19a5ce83's warning, this one is printed multiple times to
stdout even if the messages are identical; therefore backporting this to
1.16 seems reasonable.
2021-11-12 14:22:03 +01:00
Steve Cotton
19a5ce83b1 Show the id in the "[race] '' is missing a plural_name" warning
In 1.16 with Ageless Era 4.28.0, the message `[race] '' is missing a
plural_name` is printed to the chat area. The message is not useful even to
add-on developers, because it only identifies which race is affected by
`[race]name`, and in the affected races the `name` attribute is also missing.

An unfortunate side-effect of making the warnings more useful is that more of
them are shown in-game - these messages go through the logging mechanism that
discards duplicate messages. Making them useful also makes them unique.

Also log if a race lacks either a male or female singular name. This warning
will not trigger if the race has a non-empty `name`, as both gender-specific
options are documented to fall back to `name`.

Remove the warning about races that have a `name` but no `id`. Prior to 1.3.8,
[race]name= was the identifier, and there wasn't a [race]id= attribute. The
compatibility code for that change was removed in 1.7.6 (commit 160000a40), so
it seems unnecessary to keep the logging for missing ids.
2021-11-11 13:48:41 +01:00
Pentarctagon
a719b8d744
Check for potential duplicates before inserting. 2021-11-10 10:34:46 -06:00
Charles Dang
5a30092844 Merge branch 'master' of github.com:wesnoth/wesnoth 2021-11-09 22:15:53 -05:00
Charles Dang
5df993449e Rework 5e01e13cc85614fd80d4739353142d2c18fd2f0a and e54afdf8b334edfc18750630fb034e4cd539fef4
After closer examination, there was acttually a method to the madness here. Since the "process" functions
may be called more frequently than the "update" functions, we don't want to update the pointer vector and
visibility mask every time the process functions are called. This restores the old order of doing things,
but centralized in lobby_info for clarity.
2021-11-09 22:15:35 -05:00