Commit graph

24750 commits

Author SHA1 Message Date
Andras Szell
1ea4149a44 Fix: add redraw to narrator's message so village count is refreshed
Fixes: https://forums.wesnoth.org/viewtopic.php?f=21&t=48370

In the tutorial when we occupy the first village the message tells us the
village count got incremented, but in the old version it was incremented
only afterwards. Non-narrator messages were updated properly. By adding the
redraw, narrator messages triggered by capture event produce the same
result as other speakers.
2018-06-26 18:45:17 +11:00
Charles Dang
0aa60a7b4c Revert "Swapped the first watch and second watch ToD graphics"
[ci skip]

This reverts commit 11ca2d8ad8.
2018-06-25 22:49:19 +11:00
Charles Dang
893860321a Unit Advance: left-align header
[ci skip]
2018-06-25 21:59:45 +11:00
Charles Dang
dd69107c9b 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.

As for why I've decided to stick with nearest-neighbor scaling for zoom, it happens to look
a lot better when done on the GPU than on the CPU for some reason (perhaps having to do with
the old rendering pipeline in which we were doing surface scaling), and it's better to have
a consistent scaling look as you zoom in, especially if we wanted to do animated zoom-ins.

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.
2018-06-25 16:37:27 +11:00
Charles Dang
11ca2d8ad8 Swapped the first watch and second watch ToD graphics
[ci skip]

See #1905.
2018-06-25 13:41:46 +11:00
Severin Glöckner
37566db87c NR S5a: clarify text
[ci skip]
2018-06-22 18:51:08 +02:00
Severin Glöckner
e1cd47b8ec NR S7a: remove dots from objectives
[ci skip]
2018-06-22 11:57:55 +02:00
josteph
a8f83f6e68 MP Faction Select dialog: Show leader unit details.
If the leader hasn't been discovered, the "Unknown Unit" topic will be shown.

Fixes #1491
2018-06-21 06:30:20 +03:00
josteph
8481927a5a GUI: Fix the direction of the arrow on a listbox sort column header.
This affects the files list in the the "Load Game" dialog.
2018-06-20 18:47:11 +11:00
Pentarctagon
0a7ed44c08 Remove unused test file and images. 2018-06-20 18:46:01 +11:00
Severin Glöckner
9d95aa776c SotA: reuse mainline string for ancient lich
[ci skip]
2018-06-18 20:11:29 +02:00
Charles Dang
c5d6f695dd GUI2/Chatbox: limit input to 256 characters (fixes #3267)
[ci skip]
2018-06-18 20:28:33 +11:00
ln-zookeeper
a98c658742 UtBS: Cropped Kaleh's base sprite back to 72x72
[ci skip]
2018-06-17 11:05:05 +03:00
ln-zookeeper
a702674da2 EI S17b: Prevent spell breaking effect playing out twice (fixes #3254) 2018-06-17 10:53:32 +03:00
Iris Morelle
61e94c21a9 Fix several typographical style errors in recent race descriptions
[ci skip]
2018-06-17 01:54:10 -04:00
josteph
d95efd3409 Preferences: Improve label and tooltip of 'Accelerated speed' slider. 2018-06-17 10:42:48 +11:00
doofus-01
41adc41093 UtBS S08: mostly cosmetic changes to map 2018-06-17 00:32:40 +11:00
doofus-01
13ec0493fc UtBS S06b and S07b: cosmetic changes to maps, to make them more fitting with dialogs 2018-06-17 00:32:39 +11:00
doofus-01
ea3ee2a336 UtBS S06b: make sure dwarf sergeant is facing the right way in comic-relief dialog 2018-06-17 00:32:39 +11:00
doofus-01
a3294cd04d change sun-sylph halo to be warmer, sunny color, instead of clean, holy color 2018-06-17 00:32:38 +11:00
doofus-01
f0b963a2b1 slight tweak to Kalehs base sprite 2018-06-17 00:32:37 +11:00
doofus-01
5fbd494244 UtBS S05: replace troll camps with actual troll camps instead of orc castles 2018-06-17 00:32:36 +11:00
doofus-01
4b1a06a82d UtBS S04 and S05: some variations in scenery items 2018-06-17 00:32:36 +11:00
Steve Cotton
ad7bc19dd9 Prose: the Storm Trident's description uses "merfolk" (issue #2936)
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).
2018-06-15 21:02:56 +02:00
Steve Cotton
d5f6c17239 Dead Water: Change "mermen" to "merfolk" (part of #2940)
This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.
2018-06-15 21:02:56 +02:00
Steve Cotton
94dd2880c6 DW: Change the team name from Merman Forces to Merfolk 2018-06-15 21:02:56 +02:00
Charles Dang
01d37ca795 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. >_<
2018-06-15 13:21:11 +11:00
Steve Cotton
ce093e2290 DW S05: Add a po hint about the orc saying "mermen" (part of #2940) (#3243)
The orc calls them fish-men several times, so changing it to "merfolk"
wouldn't fit.

Also a whitespace fix from wmlindent.

[ci skip]
2018-06-13 13:55:04 +02:00
ln-zookeeper
c9bb31d1cc EI S11: Fixed missing prisoners (fixes #3237)
The problem was introduced by commit 0f511e8 due to the [modify_unit] tag apparently causing prisoners to disappear because technically they were duplicates as they had merely been unstored and still existed on the recall list as well.
2018-06-12 23:16:44 +03:00
Thom Diment
b3c40498d8 DW 5 Tirigaz - Changes to orc leader death event (#3103)
DW 5 Tirigaz - Changes to orc leader death event

Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader
2018-06-11 14:40:47 +02:00
doofus-01
636575627d UtBS S12: Make alien central body vulnerability more visible to player 2018-06-11 16:43:36 +11:00
doofus-01
7924649319 UtBS S11: Citadel graphics, drawn over the cavewall donut 2018-06-11 16:43:35 +11:00
Steve Cotton
fbc74bf007 Update core/about.cfg to use "merfolk" instead of "mermen" (part of #2940) 2018-06-11 01:22:06 +11:00
Iris Morelle
a92b83e404 tools: Add steam-changelog
This is a script to take a changelog section (provided in the command
line as such: `steam-changelog changelog.md X.Y.Z`) and convert it to
BBCode for posting on Steam.

[ci skip]
2018-06-10 03:25:43 -04:00
doofus-01
3f3e13c0b4 peasant attack animations 2018-06-10 14:37:20 +11:00
doofus-01
c398a8fa86 change ruffian attack anim timings 2018-06-10 14:37:19 +11:00
Charles Dang
8baeb8457d Added an advanced preference for the PRNG combat option
[ci skip]
2018-06-10 14:24:02 +11:00
Charles Dang
142a2f20ca 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.
2018-06-10 12:57:37 +11:00
Charles Dang
b5f1e1a48a Statistics Dialog: remove mode toggle in favor of an All Scenarios menu entry
Closes #2886.
2018-06-10 12:57:35 +11:00
Charles Dang
500259a7c2 DiD S6: shift the escape location slightly to account for the map redraw
[ci skip]
2018-06-10 10:57:36 +11:00
Charles Dang
b6416b8329 DiD S1/S6: new Parthyn maps
[ci skip]
2018-06-10 10:45:29 +11:00
Iris Morelle
5871557dbf Fix Lua errors when failing to set a music track on an empty playlist
Closes #3194.
2018-06-09 18:55:03 -04:00
Charles Dang
c8fc88454b Shuffled a few credits entries around
[ci skip]
2018-06-10 08:35:26 +11:00
Iris Morelle
45ab8e5b62 Make Credits page on wiki.w.o use the new TOC markup for mobile support
[ci skip]
2018-06-09 03:07:23 -04:00
stevecotton
8d055bf038 DiD S2: When ambushed by goblins, cancel any pending attack (#3227)
This happens in a village-capture event, so the unit has finished
moving for this turn in any case.
2018-06-09 01:09:53 +03:00
Severin Glöckner
18a101be66 Tutorial: show the female fighteress in the help (if she is chosen)
Uses the workaround mentioned in #3012

[ci skip]
2018-06-08 18:01:23 +02:00
Thom Diment
7feb9aee11 UtBS 5: changes to scenario locations (#3104)
* UtBS 5: changes to scenario locations

Fixes #3077:
* Moved AI leader spawns to keeps
* Changed spawn of trolls that were spawning in walls
* Sanity-checked village ownership in cavern

Fixes #3078:
* Changed spawn of Eastern Troll Flamecaster
* Fixed entry routes of Troll Flamecasters

From author notes:
* Made 'Wounded Dwarf' a wounded unit
2018-06-08 16:40:22 +02:00
ln-zookeeper
131868581d Restructured WC/Soulless bat variation defense animation (fixes #3215)
There were two overlapping problems: 1) the branching was written incorrectly (due to combining top-level and [if] filters) and 2) the first [defend] tag getting merged with the base WC/Soulless defense animation.
2018-06-08 00:38:34 +03:00
mattsc
6c38b8ce93 Goto Micro AI: add [and] to a filter
Another efficiency improvement.  This ensures that the side of the unit
is checked first before the potentially complex rest of the filter is
evaluated.
2018-06-07 06:45:30 -07:00
mattsc
0dcbe1d0d0 Goto Micro AI: change order of SLF and SUF evaluation
This is for efficiency reasons, as location filters do not necessarily
change throughout a side’s turn, while fewer and fewer units have moves
left.
2018-06-07 06:45:14 -07:00