Commit graph

24919 commits

Author SHA1 Message Date
Severin Glöckner
a62264412d DiD S10: add a redraw
apparently it happens normally only after dismissing the objectives

[ci skip]
2018-07-04 15:45:39 +02:00
Severin Glöckner
090ad3140f TSG S4: prevent leader of the undeads from suiciding
This is generally a problem with most leaders, but here it's worse.

Also changed his keep to the ruined version.
(Not the ajdacent castle tiles as it looks better that way.)

[ci skip]
2018-07-04 15:45:39 +02:00
Severin Glöckner
5dc80e7428 TSG S5: fix an unlikely scenario outcome
In case the player goes south and runs away fromt he bandits, and defeats
the lich first, then the choice to side or not with the bandits would
happen very late.
In case he allied with them and the other undead leader still lived, he
could end the scenario still by triggering "enemies defeated". If they were
already defeated, the scenario could not end anymore. Furthermore, the
storytext doesn't make sense anymore, at least the ending dilogue would
miss,
In case of siding with the elves one can still win by defeating Urza Afalas.
and the story still makes sense,

To solve this, in this special situation the player has no choice anymore,
the path of the elves is chosen.

(the diff may be hard to read; a good part has been wrappend with an [if])

[ci skip]
2018-07-03 04:12:51 +02:00
josteph
ea62caadf0 TSG S05: Merge all instances of [objectives].
Suggested by @sevu.
2018-07-03 00:48:34 +02:00
josteph
f4ba5cbcb8 TSG S05: Hide completed objectives.
Fixes #3031.
2018-07-03 00:48:34 +02:00
Charles Dang
c39aa72f56 Fixup 7807694
[ci skip]
2018-07-03 06:58:31 +11:00
Charles Dang
78076941a0 DiD S6: fixed previously stored orc leader ending up in the wrong place (fixes #3304)
[ci skip]
2018-07-03 06:48:57 +11:00
gfgtdf
5ba389111e 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.
2018-06-30 01:07:30 +02:00
gfgtdf
26b5ca55e4 disallow attacking with disabled attacks via [do_command]
this fixes some rare cheats in mp.
2018-06-30 01:06:59 +02:00
pentarctagon
649fdc9a62 Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.
2018-06-29 15:35:22 -05:00
Charles Dang
98ddc311fc Preferences: added a mention of the in-game accelerated speed toggle
[ci skip]
2018-06-29 18:21:55 +11:00
Charles Dang
10e663ed6c Preferences: shifted the Skip AI Moves button around
[ci skip]

Makes it clear it's not intrinsically tied to the Accelerated Speed factor.
2018-06-29 18:21:55 +11:00
Charles Dang
cb7a679142 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.
2018-06-29 18:10:02 +11:00
Charles Dang
226a7f7d02 Removed preference to disable halos
There's really no reason to have this anymore. It was (AFAIK) introduced years ago
as a performance-saving measure, then was moved to Advanced Preferences in 1.13 since
modern PCs mostly have no issues. With accelerated rendering, there's even less of a
reason to have this.
2018-06-29 15:07:48 +11:00
Gunter Labes
51b5549bd2 Fix line endings
[ci skip]
2018-06-28 22:02:17 +02:00
Iris Morelle
ceca46c553 wmllint: Exit with non-zero status after failing to read any directories
[ci skip]
2018-06-28 00:32:18 -04:00
Iris Morelle
fbc9ac5a52 wmllint: Skip inexistent paths passed in the command line
Fixes issue #3286.

[ci skip]
2018-06-28 00:27:28 -04:00
Charles Dang
0cbbed2832 Updated a credits entry regarding the Dunefolk
[ci skip]
2018-06-28 10:42:44 +11:00
Iris Morelle
c92e167a14 wmllint: Leave gzipped binary files alone, they're not safe for consumption
Fixes wmllint crashing like this upon encountering a gzip tarball in an
add-on:

  Traceback (most recent call last):
    File "/home/shadowm/bin/wmllint-1.14", line 3188, in <module>
      for fn in allcfgfiles(directory):
    File "/home/shadowm/bin/wmllint-1.14", line 2944, in allcfgfiles
      if interesting(os.path.join(root, name)):
    File "/home/shadowm/bin/wmllint-1.14", line 2927, in interesting
      return fn.endswith(".cfg") or is_map(fn) or issave(fn)
    File "/home/shadowm/src/wesnoth-1.14/data/tools/wesnoth/wmltools3.py", line 270, in issave
      return firstline.startswith("label=")
  TypeError: startswith first arg must be bytes or a tuple of bytes, not str

[ci skip]
2018-06-27 03:42:58 -04:00
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