24622 Commits

Author SHA1 Message Date
Charles Dang
06dd8d421d Updated a credits entry regarding the Dunefolk
[ci skip]

(cherry-picked from commit 0cbbed2832fc34f73927e38bf0141b4b7c636346)
2018-10-07 03:23:00 +00:00
Iris Morelle
fb409b5db4 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]

(cherry-picked from commit c92e167a14229ed0d9b6f16f1d1ca31cacd292cd)
2018-10-07 03:22:59 +00:00
Andras Szell
a2a22ae10b 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.

(cherry-picked from commit 1ea4149a4456ab8713dde4fbfcdd446b5762adcf)
2018-10-07 03:22:57 +00:00
Charles Dang
0e5eb5067e Revert "Swapped the first watch and second watch ToD graphics"
[ci skip]

This reverts commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8.

(cherry-picked from commit 0aa60a7b4cc3492f9d84c765f6218f00aee8830e)
2018-10-07 03:22:57 +00:00
Charles Dang
92b95d7a44 Unit Advance: left-align header
[ci skip]

(cherry-picked from commit 893860321a8da181164782b13a931b6c61f5febd)
2018-10-07 03:22:56 +00:00
Charles Dang
2420e61d14 Swapped the first watch and second watch ToD graphics
[ci skip]

See #1905.

(cherry-picked from commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8)
2018-10-07 03:22:55 +00:00
Severin Glöckner
56c347fad0 NR S5a: clarify text
[ci skip]

(cherry-picked from commit 37566db87c364daa15c1e80761160f0eb7ebaba0)
2018-10-07 03:22:51 +00:00
Severin Glöckner
ee6af7d8ce NR S7a: remove dots from objectives
[ci skip]

(cherry-picked from commit e1cd47b8ec8c9b623b73a7bd269fcc767f3849e8)
2018-10-07 03:22:50 +00:00
josteph
9f2cbad96f MP Faction Select dialog: Show leader unit details.
If the leader hasn't been discovered, the "Unknown Unit" topic will be shown.

Fixes #1491

(cherry-picked from commit a8f83f6e687abe997d33a028f841c0bdd5495a11)
2018-10-07 03:22:50 +00:00
josteph
bf8cd9f90b GUI: Fix the direction of the arrow on a listbox sort column header.
This affects the files list in the the "Load Game" dialog.

(cherry-picked from commit 8481927a5a630165c98a7c81c5cf5556ccfc9e35)
2018-10-07 03:22:49 +00:00
Pentarctagon
d6833d76d0 Remove unused test file and images.
(cherry-picked from commit 0a7ed44c087f1c66d65b8656fc197309d4c0325a)
2018-10-07 03:22:49 +00:00
Severin Glöckner
adeda87982 SotA: reuse mainline string for ancient lich
[ci skip]

(cherry-picked from commit 9d95aa776c9e0b3a6e968317a87bda1a5c48b3ee)
2018-10-07 03:22:48 +00:00
Charles Dang
8137e9a454 GUI2/Chatbox: limit input to 256 characters (fixes #3267)
[ci skip]

(cherry-picked from commit c5d6f695dd712c9a33fd3a5c12f98e19e2b393fd)
2018-10-07 03:22:47 +00:00
ln-zookeeper
0c5a47def4 UtBS: Cropped Kaleh's base sprite back to 72x72
[ci skip]

(cherry-picked from commit a98c6587425f9d34e0f0316133e7757902d0c3ed)
2018-10-07 03:22:46 +00:00
ln-zookeeper
3be3f0acbb EI S17b: Prevent spell breaking effect playing out twice (fixes #3254)
(cherry-picked from commit a702674da2fa8df0b47126a3ee51c255d90aab26)
2018-10-07 03:22:46 +00:00
Iris Morelle
4712fe1cc6 Fix several typographical style errors in recent race descriptions
[ci skip]

(cherry-picked from commit 61e94c21a9d2a7e6b195f245361900329a624af8)
2018-10-07 03:22:44 +00:00
josteph
01bd2af9ae Preferences: Improve label and tooltip of 'Accelerated speed' slider.
(cherry-picked from commit d95efd3409f75614c48732dc3532e6fd2f166dd4)
2018-10-07 03:22:44 +00:00
doofus-01
2482cf2c53 UtBS S08: mostly cosmetic changes to map
(cherry-picked from commit 41adc41093a47de4508e093508cbf83cb45ddcf0)
2018-10-07 03:22:43 +00:00
doofus-01
b1d97a8496 UtBS S06b and S07b: cosmetic changes to maps, to make them more fitting with dialogs
(cherry-picked from commit 13ec0493fc810b184771b937e3b8e3ef67c3c5dc)
2018-10-07 03:22:43 +00:00
doofus-01
4d897f4e96 UtBS S06b: make sure dwarf sergeant is facing the right way in comic-relief dialog
(cherry-picked from commit ea3ee2a336320d955f4efa171ff862954f8c37cf)
2018-10-07 03:22:43 +00:00
doofus-01
fbb8817931 change sun-sylph halo to be warmer, sunny color, instead of clean, holy color
(cherry-picked from commit a3294cd04d6be0c4badfea84daf0e65a5cc6cd48)
2018-10-07 03:22:42 +00:00
doofus-01
9f74f4bff1 slight tweak to Kalehs base sprite
(cherry-picked from commit f0b963a2b168637206c2ffb7b0a01edbda8b33ce)
2018-10-07 03:22:42 +00:00
doofus-01
a66d47425e UtBS S05: replace troll camps with actual troll camps instead of orc castles
(cherry-picked from commit 5fbd494244fc01cf4f1df0930f92e5f900d95ed0)
2018-10-07 03:22:42 +00:00
doofus-01
0b818bd29a UtBS S04 and S05: some variations in scenery items
(cherry-picked from commit 4b1a06a82da5883bdbe5408a0667c3c1cff893d0)
2018-10-07 03:22:41 +00:00
Steve Cotton
1aa974a250 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).

(cherry-picked from commit ad7bc19dd98990b443bd5037952ff612dce502af)
2018-10-07 03:22:37 +00:00
Steve Cotton
175c95a2df 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.

(cherry-picked from commit d5f6c1723910ba32326aff466c1fb710f6afa803)
2018-10-07 03:22:37 +00:00
Steve Cotton
b87c36274a DW: Change the team name from Merman Forces to Merfolk
(cherry-picked from commit 94dd2880c6f71e16bee607ebb7b3fbd2c2e5b410)
2018-10-07 03:22:37 +00:00
Charles Dang
98299d56ef 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. >_<

(cherry-picked from commit 01d37ca7953f3efdd143f7265ecc94dc01791ebb)
2018-10-07 03:22:36 +00:00
Steve Cotton
58d046cacd 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]

(cherry-picked from commit ce093e229016f09da90415dd59305c36958b7c18)
2018-10-07 03:22:36 +00:00
ln-zookeeper
c2bba0512f 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.

(cherry-picked from commit c9bb31d1cc9182a4450f29ae529416d2192ab4f9)
2018-10-07 03:22:36 +00:00
Thom Diment
26dd437f81 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

(cherry-picked from commit b3c40498d83d4ad3d0701baaee7ca8166546c7e3)
2018-10-07 03:22:35 +00:00
doofus-01
fdd8f5737d UtBS S12: Make alien central body vulnerability more visible to player
(cherry-picked from commit 636575627d6616c47a7678c71fc127d8f8dde841)
2018-10-07 03:22:34 +00:00
doofus-01
1e8163c93f UtBS S11: Citadel graphics, drawn over the cavewall donut
(cherry-picked from commit 79246493191443ccac936b92b6d413a3d28c126e)
2018-10-07 03:22:34 +00:00
Steve Cotton
49d53795a6 Update core/about.cfg to use "merfolk" instead of "mermen" (part of #2940)
(cherry-picked from commit fbc74bf007258436a65926bf3e3edf9f7aa143f3)
2018-10-07 03:22:33 +00:00
Iris Morelle
482b003a16 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]

(cherry-picked from commit a92b83e40466c6ea53d9ad98907abb4d9ce4d4ee)
2018-10-07 03:22:33 +00:00
doofus-01
ff4821841a peasant attack animations
(cherry-picked from commit 3f3e13c0b4375a7cf8df8ee6931c0a850b950863)
2018-10-07 03:22:32 +00:00
doofus-01
037f515e41 change ruffian attack anim timings
(cherry-picked from commit c398a8fa8651411c6d0b9742464c063cd0534a86)
2018-10-07 03:22:32 +00:00
Charles Dang
3f9137f7e8 Added an advanced preference for the PRNG combat option
[ci skip]

(cherry-picked from commit 8baeb8457d96e2048ebdac9188bb95fcfbffd340)
2018-10-07 03:22:31 +00:00
Charles Dang
1e1839de3d 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.

(cherry-picked from commit 142a2f20ca70deaf4d6a71c918de47aef366fc47)
2018-10-07 03:22:30 +00:00
Charles Dang
1871a32995 Statistics Dialog: remove mode toggle in favor of an All Scenarios menu entry
Closes #2886.

(cherry-picked from commit b5f1e1a48a9d817d1d68a5868903bb3e518cba3d)
2018-10-07 03:22:30 +00:00
Charles Dang
4e97b511f3 DiD S6: shift the escape location slightly to account for the map redraw
[ci skip]

(cherry-picked from commit 500259a7c2aab1f296441e720ee057e068291a32)
2018-10-07 03:22:29 +00:00
Charles Dang
115c8d1d0c DiD S1/S6: new Parthyn maps
[ci skip]

(cherry-picked from commit b6416b832929a71e6611e1172a0f9e3796f505b5)
2018-10-07 03:22:29 +00:00
Iris Morelle
e68bdd1b5f Fix Lua errors when failing to set a music track on an empty playlist
Closes #3194.

(cherry-picked from commit 5871557dbfe407ab454d9f55be6bc2a0fcad0434)
2018-10-07 03:22:28 +00:00
Charles Dang
90cc4569a7 Shuffled a few credits entries around
[ci skip]

(cherry-picked from commit c8fc88454bddbfb03b7da9f9007dcb442cc27485)
2018-10-07 03:22:27 +00:00
Iris Morelle
628d0d9ed2 Make Credits page on wiki.w.o use the new TOC markup for mobile support
[ci skip]

(cherry-picked from commit 45ab8e5b6229d40d3c23e2cd64d3c7922a1e55c8)
2018-10-07 03:22:25 +00:00
stevecotton
ae9559d8f0 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.

(cherry-picked from commit 8d055bf038624fc61d965049832722555711af8a)
2018-10-07 03:22:25 +00:00
Severin Glöckner
322afd978a Tutorial: show the female fighteress in the help (if she is chosen)
Uses the workaround mentioned in #3012

[ci skip]

(cherry-picked from commit 18a101be6650fa19da900e680a29a39049ce69c0)
2018-10-07 03:22:24 +00:00
Thom Diment
f5c791d598 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

(cherry-picked from commit 7feb9aee113def823d506f987d0bee737da60ed7)
2018-10-07 03:22:23 +00:00
ln-zookeeper
2373407bd2 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.

(cherry-picked from commit 131868581d1bb22c2d5612e223657951489e6c1d)
2018-10-07 03:22:22 +00:00
mattsc
22ca458bfd 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.

(cherry-picked from commit 6c38b8ce934ea68bd11a3aa960a91fe6f9dbfb87)
2018-10-07 03:22:21 +00:00