75651 Commits

Author SHA1 Message Date
loonycyborg
755c5057d8 Make docker builds copy wesnothd to output/ too 2019-11-07 20:55:42 +03:00
Steve Cotton
d67e08826d Add a log message if a campaign doesn't have a scenario matching first_scenario
Otherwise this situation gives the WML coder merely the message "Failed to load
the scenario", without any further hint about why. The tagname is printed in case
the scenario needs to be a [multiplayer] or a [test] instead of a [scenario].
2019-11-07 18:32:07 +01:00
nemaara
cc4759c36d DiD S12: use new mushrooms 2019-11-07 00:15:30 -05:00
nemaara
384257739e DiD S12: add third reflection pool 2019-11-07 00:12:14 -05:00
nemaara
f8462322a0 DiD S12: add easter eggs 2019-11-06 20:56:13 -05:00
Steve Cotton
f46baa95dc Fixup f0f7b7beb - po lines should go above the line the refer to
The two tips above this one both have po lines that apply to 'source'
rather than 'text', but this one needs to apply to 'text'.
2019-11-07 02:43:18 +01:00
Steve Cotton
362700e885 Make "Quit" the only mandatory widget on the title screen
Everything else is optional, so the UX can be changed simply by removing
buttons and the tips widget from the title_screen.cfg file.
2019-11-07 02:41:45 +01:00
loonycyborg
a7ba3a71cb Place dependencies for running steamrt build in correct subdir 2019-11-06 23:30:08 +03:00
Sergey Lavrenyuk
f0f7b7beb0 Added tip of the day regarding changing difficulty level in a mid-campaign 2019-11-07 07:04:36 +11:00
nemaara
f0a981c11d DiD S12: touch up dialogue 2019-11-06 14:34:12 -05:00
Iris Morelle
739e2608db gui2/campaign_selection: Make descriptions and abbreviations search terms
This should extend the dialog's usefulness in a way that is more or less
consistent with the Add-ons Manager's search function. Although one
issue is that abbreviations are often found floating around in their
English form ("HttT") instead of the various localized versions ("HaT").
2019-11-06 14:32:39 -03:00
loonycyborg
42293897e5 Add dockerfile for making mingw cross-compile builds 2019-11-06 19:39:38 +03:00
loonycyborg
4638a4b5b8 Improve start.sh scritp for steamos build 2019-11-06 15:07:14 +03:00
nemaara
5f48d16990 DiD S11: add reflection pool 2019-11-06 02:23:50 -05:00
nemaara
8e44b98c06 DiD S3: reflection pool, not reflecting pool 2019-11-06 00:18:51 -05:00
nemaara
01628aecfc DiD S11: add monolith and puzzle icons 2019-11-06 00:13:43 -05:00
nemaara
cd64048d02 DiD S11: remove explicit mention of runes 2019-11-05 20:56:04 -05:00
Wedge009
0bba03dd02 Leave help_impl.cpp in wesnoth text domain
[ci skip]
2019-11-06 10:35:27 +11:00
Wedge009
da609b933a Use fixed-width alignment for time-of-day icons 2019-11-06 10:35:27 +11:00
Wedge009
d232a8c7c2 Add note about time-of-day bonus text colouring 2019-11-06 10:35:27 +11:00
Wedge009
771b1720db Add time-of-day alignment icons to Help 2019-11-06 10:35:27 +11:00
Wedge009
f749608e79 Help Time of Day Bonuses: Add text-domain and colouring 2019-11-06 10:35:27 +11:00
Wedge009
ab40d88a05 Add Time of Day Bonuses to Help
Also mark 'Time of Day Schedule' and bonus strings for translation, to synchronise with what 1.14 branch has.

Resolves #3064
2019-11-06 10:35:27 +11:00
Charles Dang
b165925c55 Campaign Dialog: shifted Save Random Seed button (still needs to be removed)
[ci skip]
2019-11-06 08:00:19 +11:00
newfrenchy83
ee98253671 Update wesnoth.cbp 2019-11-06 07:49:33 +11:00
newfrenchy83
80cf902cec Update tests.cbp 2019-11-06 07:49:13 +11:00
newfrenchy83
976e4db819 Update wesnoth.cbp 2019-11-06 07:49:13 +11:00
Elvish_Hunter
8c6e637b9d Make wmllint ignore race= inside filters in [unit_type]
Fixes #4105
2019-11-05 20:00:05 +01:00
Charles Dang
fbc1126875 Game Load: really large button for you too
[ci skip]
2019-11-06 05:25:48 +11:00
Charles Dang
fe2d59dbbb Campaign Selection: all hail the Really Large Button
[ci skip]
2019-11-06 05:21:48 +11:00
Charles Dang
8cfc12bf99 Preferences: ignored -> blocked
[ci skip]
2019-11-06 05:15:15 +11:00
Charles Dang
287ec15c10 Updated credits
[ci skip]
2019-11-06 04:09:33 +11:00
nemaara
ed209a6f32 DiD S11: update map 2019-11-05 11:52:27 -05:00
Martin Hrubý (hrubymar10)
a453dc05be
Fix Xcode project 2019-11-05 17:22:37 +01:00
Iris Morelle
666c4d27ce gui2/game_load: Improve display of old versions selection
* Return paths from fs API in the native format, not the generic
   format. The generic format looks wholly out of place on Windows.

 * Move the versions selector to the row with the dialog caption and
   Search box as per d53ca602b8df5cc302cd1d5d502654823dc67415.

 * Relabel options to make the purpose of the combobox clearer even
   without the tooltip.

 * Fix markup not being taken into account for the combobox option
   labels, and protect against potential markup characters in paths
   (shouldn't happen on Windows but it can happen on POSIX platforms).
2019-11-05 12:34:52 -03:00
Iris Morelle
e15a611a9c fs: Consider platform differences when enumerating alternate save paths
The original code by octalot only works correctly on X11 when using the
recommended fdo layout. Windows and macOS need their own logic to build
candidate paths.

The code is still very optimistic about this whole thing -- see the
comment. Ideally we need to refactor the system to determine user data
path defaults so we can do it as many times as necessary even if we've
already determined our current user data path, but that seems like a lot
of work for a worst-case scenario that's not gonna crop up very often.

Also, I have no idea if the macOS alternative works, or what will happen
on iOS for that matter. It should at least compile.
2019-11-05 12:16:40 -03:00
Iris Morelle
b24f755c28 fs: Avoid an unused variable warning
This is very configuration-specific and only seems to happen on Windows
at the moment, which is kind of intentional from what when I discussed
the code with josteph.
2019-11-05 12:15:34 -03:00
Iris Morelle
cd407be639 gui2/game_load: Give the OK button a custom label
[ci skip]
2019-11-05 11:28:00 -03:00
Charles Dang
a7b30d42ae Ensure terrain scales with NN
Turns out this wasn't even respecting the old scaling algorithm settings. It was just using linear scaling :|
2019-11-05 23:15:21 +11:00
Charles Dang
b9fac4313d Updated VC16 projectfile
[ci skip]
2019-11-05 23:13:21 +11:00
Charles Dang
a6ec345fc8 Loading Screen: removed hardcoded padding dimensions
Credit to @shikadiqueen for the idea. This fixes potential crashes if the padding can't fit on certain resolutions.
Also keeps the vertical spread consistent between resolutions (no more < 800 height handling).
2019-11-05 22:57:02 +11:00
Charles Dang
15bf3bb256 Removed scaling algorithm customization
We're going to be using NN scaling for the map, and that's already handled automatically
by SDL (and in the future, OGL). We don't need these settings for surface SCALED_TO_ZOOM
and SCALED_TO_HEX scaling. In any case, if we want to scale a surface to zoom or hex, it
will almost certainly be for map rendering (such scaling methods don't make sense in the
UI, for example), so just defaulting to NN is simplest.

This change drops the option to use Linear or xBRZ scaling for map zooming. This was already
the practical case due to me converting map rendering to use textures. NN was used for all
zoom levels, and it's fast and looks good.
2019-11-05 22:55:05 +11:00
nemaara
ff4b308d2c DiD S11: tweak dialogue 2019-11-05 03:37:33 -05:00
nemaara
266f362849 DiD S7: fix zombie's hitpoints 2019-11-04 23:39:51 -05:00
nemaara
233b2f841c DiD S10: add some on map events 2019-11-04 23:39:29 -05:00
nemaara
81f5e0e7a6 DiD S10: update dialogue 2019-11-04 21:26:00 -05:00
Iris Morelle
c75b7c1681 wmllint: Ignore [load_resource] for unit id validation
Fixes #4538.

[ci skip]
2019-11-04 22:13:25 -03:00
Iris Morelle
7c16ced6d4 bi: The file format's name is JPEG, not JPG
(jpg is the most common file extension, not the format's name.)
2019-11-04 21:40:11 -03:00
Iris Morelle
46dbbc06c9 gui2: Use custom OK labels for the Campaign menu dialogs
[ci skip]
2019-11-04 20:48:12 -03:00
Iris Morelle
d53ca602b8 gui2: Reclaim vertical real estate from some Search boxes
Several dialogs have Search boxes accompanying a central element, with
the boxes taking up a whole row of their own. For both aesthetic and
space allocation purposes it turns out to be more convenient to relocate
these boxes to the top right corner of the dialog to share room with the
dialog's caption.

This only applies to the Campaigns menu, Load Game, Create Unit, and
Recall Unit dialogs. The Recruit Unit dialog, interestingly enough,
already used this approach (an accident?).

Chat Log and the Add-ons Manager *could*, in theory, use this same
change, but they are a bit trickier because of the additional controls
attached to the Search box -- especially so in the Add-ons Manager's
case.

[ci skip]
2019-11-04 20:35:03 -03:00