26477 Commits

Author SHA1 Message Date
Elvish_Hunter
f0bdd01918 help.cfg: fixed wmllint warnings about translation marks
Fixes some of the warnings listed in #4494
2019-11-10 15:45:04 +01:00
Elvish_Hunter
8f52a49800 wmllint: removed a few asserts and postponed a few unit sanity checks
Fixes #4102
2019-11-10 10:45:46 +01:00
nemaara
5162168a67 DiD S4: make spectral servant not break ice 2019-11-10 00:41:42 -05:00
nemaara
61963d71c9 DiD S3: make rats not spawn in the wall 2019-11-09 12:35:41 -05:00
sigurdfdragon
f55704cff8 SotA: Remove unneeded code
No longer necessary after b2cd1cf6:
Handle unit overlays as modifications, allow [effect] to remove them
2019-11-09 11:55:03 -05:00
nemaara
50629f28cb Change dunefolk units in faction definitions and pathfinding tests 2019-11-08 16:44:13 -05:00
nemaara
173edb9648 Update dunefolk in wmllint 2019-11-08 03:46:09 -05:00
nemaara
7036af787f Nagas: rename slasher advancement line 2019-11-08 01:53:04 -05:00
nemaara
f6288b1503 Dune Horse Archer/Windbolt: rename units from swift/windrider 2019-11-08 01:53:01 -05:00
nemaara
025c7ed691 Dune Wayfarer: rename from Ranger 2019-11-08 01:52:31 -05:00
nemaara
836f0981d2
Merge pull request #4530 from Hejnewar/master
Dunefolk balance update.
2019-11-08 01:43:27 -05:00
nemaara
9752f7aa3e DiD: small tweaks 2019-11-08 01:14:37 -05:00
Hejnewar
1dc22f1386
Update Apothecary.cfg 2019-11-08 00:31:32 +01:00
Hejnewar
e3f577babd
Update Alchemist.cfg 2019-11-08 00:30:01 +01:00
Hejnewar
533c04ab3e
Update Raider.cfg 2019-11-08 00:28:43 +01:00
Hejnewar
60ef2b6561
Update Scorcher.cfg 2019-11-08 00:27:44 +01:00
Hejnewar
23e717a16a
Update Bladewhirler.cfg 2019-11-08 00:27:10 +01:00
Hejnewar
1b9f83a2c4
Update Ringcaster.cfg 2019-11-08 00:26:51 +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
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
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
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
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
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
cd407be639 gui2/game_load: Give the OK button a custom label
[ci skip]
2019-11-05 11:28:00 -03: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
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
nemaara
b0b2e064d9
Merge pull request #4549 from slavrenyuk/trow_fixed_haldric_defense_animation
TRoW: Fixed Haldric's defense animations
2019-11-04 18:30:01 -05:00
nemaara
dae9070a7a DiD S8/S9: use new terrains 2019-11-04 17:48:54 -05:00
nemaara
9975d3b124 DiD S9: make map more interactive 2019-11-04 17:40:43 -05:00
nemaara
5eced35cd6 DiD S8: add more map interactability 2019-11-04 17:01:35 -05:00