0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
75023 commits 51 branches 369 tags 4.7 GiB
Commit graph

25953 commits

Author SHA1 Message Date
Wedge009
ec3ebac5ae Display left-facing Delfador portraits on the right. 
Some of Delfador's portraits face to the left. A cosmetic change only, but we prefer to such portraits to be displayed to the right of the dialogue so that they face the 'middle'. It also gives impression of a conversation with a right-facing portrait displayed (by default) on the left.

Resolves #4345.

[ci skip]

(cherry picked from commit d29e73ec02)
 2019-10-25 13:42:17 +11:00
Wedge009
4dda5af0a3 Add translation notes. 
[ci skip]

(cherry picked from commit 46739fcfaa)
 2019-10-25 13:41:27 +11:00
Iris Morelle
35acea3615 wam: Add UI strings for core, other, and unknown add-on types 
[ci skip]
 2019-10-24 18:11:24 -03:00
nemaara
8ea4616484 TSG S7b/S8b: modify dialogue upon alliedunit death 2019-10-23 00:33:17 -04:00
josteph
12ddac89f4 units: Add custom [special_note]s. 
(cherry picked from commit 7f96d1f288)

[ci skip]
 2019-10-23 13:04:31 +11:00
pentarctagon
3bc7b3fae7
Make additional changes to client source handling based on discussion. 
Add a "BSD Repository" option.
Add data/dist to .gitignore.
Delete data/dist from git.
Error conditions reading data/dist just set the value to Default.
Remove a leftover TODO comment.
Add description comments for the two new database columns.
 2019-10-22 01:07:44 -05:00
nemaara
599e51b173 TSG S7b/S8b: reduce enemy gold values 2019-10-21 17:25:09 -04:00
josteph
8c5f187b6c EI: Fix the "Northlands" fix 
(cherry picked from commit d1a72cafff)
 2019-10-22 00:47:51 +11:00
josteph
e3d86d1a89 HttT S18: Fix "noble merfolk". 
(cherry picked from commit 437ff89ab1)
 2019-10-22 00:47:50 +11:00
josteph
05e4638083 EI: Typo fix 
(cherry picked from commit 4a1d71b5ec)
 2019-10-22 00:47:47 +11:00
josteph
cce8e75d13 fixup! Fixes from SpellingMistakes 
Revert the Orc Ruler change, IRC feedback says "out of" is implied.

(cherry picked from commit 1017018e44)
 2019-10-22 00:47:43 +11:00
josteph
ceabfa7b68 HttT: Typo fixes 
(cherry picked from commit 87e3e8f9cf)
 2019-10-22 00:46:12 +11:00
josteph
74562e2946 Fixes from SpellingMistakes 
(cherry picked from commit 74589a642c)
 2019-10-22 00:43:39 +11:00
pentarctagon
5dbc990781
Store client version and source information in the database. 
This will have wesnoth now provide the source where it was downloaded from the wesnothd.
wesnothd will now store that, as well as the client's version in the `game_player_info` table.

Backport of #4446
 2019-10-20 17:15:35 -05:00
josteph
0d611acaf8 Bump deprecation level of old early finish / carryover macros 
(cherry picked from commit fff2f13f7f)
 2019-10-20 00:12:50 +00:00
Charles Dang
5a9e9f6f44 Fixed turn display at ridiculously tiny res 
[ci skip]
 2019-10-18 15:27:22 +11:00
Charles Dang
1cd58dc6e1 Ensure enough space to display turn numbers in the hundreds 
[ci skip]
 2019-10-18 15:09:14 +11:00
nemaara
efcad39ebc TSG S6a: move Deoran's dialogue to event end 2019-10-16 01:52:05 -04:00
nemaara
bf01a3abf9 TSG S7b: use loyal overlay for Afalas 2019-10-16 00:38:38 -04:00
nemaara
e7cc380bad TSG S7a: remove Grek's ability to recruit and use loyal overlay for Hylas and Gerrick 2019-10-16 00:37:25 -04:00
Charles Dang
dd0b073c05 Simplify a few wesnoth.*_unit calls 
[ci skip]
 2019-10-15 20:21:22 +11:00
Jyrki Vesterinen
7ba24d60d8 Move ms_after= to the right place in music macros (#4459) 
I originally added it in #719. At that point ms_after= affected the *previous*
track due to a bug; however, I had assumed the behavior to be intentional and
compensated for it by adding ms_after= to the first track of a scenario instead
of the story screen music.

In April, I saw the documentation for ms_after= which said that it's supposed
to affect the track itself, not the previous one. Hence, I fixed the bug in
commit b023b818c7. However, I had forgotten that the changes I had made
in #719 depended on the old broken behavior of ms_after=.

This commit moves ms_after= to the right place, restoring the fade-out on
scenario start and removing the pointless pause after the first track.
 2019-10-13 12:19:07 +03:00
nemaara
d041416230 Sun Singer/Sylph: modify faerie fire colors 2019-10-11 03:10:30 -04:00
nemaara
78006509e8 Sun Singer: tweak description wording 2019-10-11 01:53:38 -04:00
josteph
c33cf245bd HttT S5b: Lift fog around the ship's path, so it's clear who's speaking to Konrad. 
Issue #4251

(cherry picked from commit dc4ec82364)
 2019-10-11 02:18:16 +00:00
josteph
611dfd1372 HttT S15: Change $unit's line since it doesn't know these caves. 
(cherry picked from commit 94c0f6152c)
 2019-10-10 02:18:53 +00:00
josteph
86e4d89fbb HttT S15: Add a female_message. 
$unit could be a female Footpad.

(cherry picked from commit 16a4b3e77f)
 2019-10-10 02:18:53 +00:00
josteph
9b0527efe3 HttT S15: Tweak new dialog 
(cherry picked from commit 043d1fefd7)
 2019-10-10 02:18:52 +00:00
jostephd
285bdc558b HttT S19c: Avoid "Princess" as a direct address 
Co-Authored-By: nemaara <nemaara@users.noreply.github.com>
(cherry picked from commit 78d8fa3a05)
 2019-10-10 02:18:52 +00:00
jostephd
61b4648fdd HttT S19c: Avoid "Princess" as a direct address 
Co-Authored-By: nemaara <nemaara@users.noreply.github.com>
(cherry picked from commit 450252cf8d)
 2019-10-10 02:18:52 +00:00
josteph
86fd284ab7 HttT S19c: Don't let lvl3 or lvl4 elves match the "We hear and obey" line. 
A Sylph wouldn't say that to Konrad.

(cherry picked from commit 4365913e6a)
 2019-10-10 02:18:52 +00:00
josteph
00775ab29d HttT S19c: Give Konrad another line. 
(cherry picked from commit 7b51357e46)
 2019-10-10 02:18:51 +00:00
josteph
1a40cc6216 HttT S19c: Change the dialog on finding Warven 
(cherry picked from commit a838af438d)
 2019-10-10 02:18:51 +00:00
josteph
0b7eee9630 HttT S15: Remove the "Timber" line. It doesn't work. 
(cherry picked from commit 92ad4c5d1e)
 2019-10-10 02:18:51 +00:00
josteph
945a4e45fc HttT S15: Enhance the north corridor event 
(cherry picked from commit d992b5bb29)
 2019-10-10 02:18:51 +00:00
josteph
db2c211ba0 HttT: dialog tweaks 
(cherry picked from commit 0132b871aa)
 2019-10-10 02:18:50 +00:00
josteph
1ce7c21e1d Auction X: Don't shuffle the center side 
(cherry picked from commit d154cf14a6)
 2019-10-08 21:03:21 +00:00
Steve Cotton
80a2ace28c Tutorial S02: Show "recruit the right units" when the player has gold 
It's confusing when it pops up on turn 12, regardless of the game state. My
leader is normally on the other side of the river from my keep, and I always
wonder "what about my play triggered that?"

Move the message to be part of the "I now have enough gold to recruit more
units" hint.
 2019-10-08 19:34:12 +02:00
mattsc
71464b1a7c Lua AI utility functions: fix for chance-to-hit specials without id 
All mainline chance-to-hit weapon specials have ids, but it is not required for UMC specials.
 2019-10-05 20:22:24 -07:00
mattsc
f77dbe4804 Herding Micro AI: fix variables not being local 2019-10-05 20:17:00 -07:00
mattsc
882ba311c6 Experimental AI recruiting: fix eval debug output 2019-10-05 20:13:23 -07:00
mattsc
2436195012 Lua AIs: replace print() by std_print() 2019-10-05 20:05:12 -07:00
mattsc
d98b7f6746 Lua AIs: remove unused debug output 2019-10-05 20:01:04 -07:00
Steve Cotton
656a44664d Tutorial S02: Make the grunt cross the bridge without bait (#4425) 
Not a code-revert, but a behavior-revert of the switch of this unit
to use the guardian AI. 26327a5bdc.

If he somehow doesn't get across the bridge, warn the player
that something has broken.
 2019-10-05 19:42:12 +02:00
mattsc
91b84539de Experimental AI: fix poisoners ignoring [avoid] tag 2019-10-05 07:21:28 -07:00
Steve Cotton
0be05d06d5
NR S06a: Fix the filter for Tallin complaining that they're sitting in the caves (#4371) 
Now it only triggers if five or less units are outside.
 2019-10-03 15:52:53 +02:00
Severin Glöckner
2bfb565735 TSG 4: avoid endless loop in debug mode 
There are no adjacent hexes if she isn't there.
 2019-10-01 19:08:45 +02:00
Severin Glöckner
056bd401d0 TSG 5: add color to narrator message. 2019-10-01 19:08:11 +02:00
josteph
06ff3d8626 fixup! tips: Add a tip about allied healing 
Use a typographical apostrophe.

(cherry picked from commit e35fb7b90e)
 2019-10-01 13:13:56 +00:00
Nils Kneuper
d037a47735 updated Chinese (Simplified) translation 2019-10-01 14:00:57 +02:00