upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 16:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,046 Commits 60 Branches 374 Tags
Commit Graph

24907 Commits

Author SHA1 Message Date
DisherProject
5e2ccd911b TRoW S14: Fix sea serpents placement 2018-10-18 12:24:32 -05:00
DisherProject
9c267b1433 TRoW S4: Fix scorpions placement 2018-10-18 12:24:32 -05:00
DisherProject
8a0490b111 TRoW: Give monsters and undeads their own sides 
Noticing that orcs can control undead units feels strange. This
can give the AI an advantage too. One would expect monsters and
undeads to move autonomously.
 2018-10-18 12:24:32 -05:00
DisherProject
1311aa0aed TRoW: use [show_if] inside the [objectives] tag 2018-10-18 12:24:32 -05:00
DisherProject
dd24dd6b6e TRoW S22: Fix win and defeat conditions 
This makes sure that when Jevyan dies, we check for Aethyr's
presence before doing anything, so the player loses immediately
if he's alive.
Furthermore, we must hide the last orc leader, or his death will
make the player lose.
 2018-10-18 12:24:32 -05:00
DisherProject
b911e9a196 TRoW S17d: Kill all enemy units in the end 
For consistency to what Haldric says before
 2018-10-18 12:24:32 -05:00
DisherProject
7c6bb12515 TRoW S15: Update Dionli's unit image 2018-10-18 12:24:32 -05:00
DisherProject
60d24516ef TRoW S6: Replace old sound with unit's own defending animation 2018-10-18 12:24:32 -05:00
DisherProject
2dbf9f87eb TRoW: Fix some TODOs and add more 2018-10-18 12:24:32 -05:00
DisherProject
15d2b035e5 TRoW: Replace deprecated keys 2018-10-18 12:24:32 -05:00
DisherProject
5be5d32690 TRoW: General cleanup 
Clear variables, macros and comments
 2018-10-18 12:24:32 -05:00
nemaara
313959c83e
DiD S10: added time over defeat scene 2018-10-17 12:45:21 -05:00
gfgtdf
ae5c5c4043
fix missing comma 2018-10-17 00:13:27 +02:00
gfgtdf
1a7724e547 reset unit overlay & image_mods on advance_to 
this fixes remove_modification for these effects, and also a bug where these effect would be applied twice after a unit advances.

fixes #3264
fixes #3220

This also changes the implementation of [unit_overlay] to use [effect]s now so tht changesdone via [unit_overlay] ae persistent as they were before.
 2018-10-16 23:03:37 +02:00
ln-zookeeper
71c6cdaa53 Updated Kwandulin's credits 2018-10-14 12:11:20 +03:00
Jyrki Vesterinen
1fd668bb1e Add @JGelfand to credits 2018-10-14 12:11:20 +03:00
Elvish_Hunter
2addd69a34 wmllint: fixed a bug that caused misfires in translation mark warnings 
wmllint was checking for line instead of lines[i]
 2018-10-14 12:11:19 +03:00
Elvish_Hunter
fd26be92e0 wmllint: fixed non-empty tagstack errors due to [modify_ai] paths 2018-10-14 12:11:19 +03:00
Elvish_Hunter
fe26f513b8 wmllint: add translation mark only after the first equal sign 
Fixes #3489
 2018-10-14 12:11:19 +03:00
sigurdfdragon
196764ffe8 DM S08: Cleanup & improve ending sequence, fixing #3575 
Removes final black screen that could be mistaken for a bug.
Shows Delfador disappearing in front of the orcs more clearly.

[ci skip]

(cherry-picked from commit 75ab69d885163dd4bb40259cf91123394e2c12ee)
 2018-10-07 03:25:23 +00:00
josteph
9514298858 MP Create Game: Increase slider step size 
Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680

(cherry-picked from commit 9abdc20841ac12db3bb8cf9338a7f7b4b205bb41)
 2018-10-07 03:25:21 +00:00
jostephd
e766cdc7cc WML: Support [filter_side] in [item]. (#3533) 
* WML: Support [filter_side] in [item].

If [filter_side] is present then "team_name" is ignored.

Fixes #1477.

* WML: Compare [item]team_name to [side]team_name using intersection.

Fixes problems with substrings and when one or the other is a
comma-separated list. See #3533

* WML: Rename [item][filter_side] to [item][filter_team]

* Add changelog entry

(cherry-picked from commit 3a3b752881f50ad34742c5962d40d96556adf1a1)
 2018-10-07 03:25:20 +00:00
V N
20177dbe5e prevent double execution of on_event.lua 
makes it safe to dofile("on_event.lua")

(cherry-picked from commit 6010ffe98ee2dd4450ec8fa42e89d6e0557c8dad)
 2018-10-07 03:25:18 +00:00
Severin Glöckner
72e3e495ed THoT: replace [filter_wml] 
[ci skip]

(cherry-picked from commit b8d8be3436dc415a5f8ad924599bfa67bbd51743)
 2018-10-07 03:25:17 +00:00
Severin Glöckner
4c6de5988d fixup 
[ci skip]

(cherry-picked from commit e5b4fcdfd35804390d5e5ae760055219e5d214bd)
 2018-10-07 03:25:16 +00:00
Severin Glöckner
7b36ccc823 THoT: add potential workaround for #3547 
It's anyway a good idea to change this code.

[ci skip]

(cherry-picked from commit 56111818e972332391d520ad900cccfdb4a23ec0)
 2018-10-07 03:25:16 +00:00
Andras Szell
c4f8f759e0 Tutorial S1: display an undo message if impossible to reach next target 
Fixes #3039

Until the elves attack the quintain it is not allowed to end turns
before completing the given tasks. Display a message how to undo if
there is not enough MP remaining to reach the current destination or
an enemy by either unit.

[ci skip]

(cherry-picked from commit b16b7f032a6be74451016be3b3f3d69cd229de00)
 2018-10-07 03:25:16 +00:00
Severin Glöckner
f6f7572126 ANL: fix village gold being too low 
[ci skip]

(cherry-picked from commit 09f418bdd84838d0230e3d01779c4f567637ece2)
 2018-10-07 03:25:15 +00:00
DisherProject
c28b24196e SoF: add [show_if] to the objectives 
(cherry-picked from commit 648035fa1e89860a596b6a119e86c51227691faf)
 2018-10-07 03:25:11 +00:00
DisherProject
6814f85b5c SoF: Postpone Gryphon Riders availability 
(cherry-picked from commit 67f49712c62d295a74a41ebe1aa138ab37c08e34)
 2018-10-07 03:25:11 +00:00
DisherProject
8d8a46e157 SoF S9: Fix some events and add TODOs 
(cherry-picked from commit bc4a5e832b3a241435869f63fc70f1856dde8bdf)
 2018-10-07 03:25:11 +00:00
DisherProject
b90d6aaa6b SoF S7: Don't let the player kill all of the enemies 
(cherry-picked from commit 5013a9f3e5616665f080f3fb35018cdc48f0d119)
 2018-10-07 03:25:10 +00:00
DisherProject
9ab08eb1f3 SoF S6: Set correct speaker for [message] 
Alanin addresses Rugnur, and not Thursagan

(cherry-picked from commit 20cd56324c771ac55111778fbda7df14f1a7e279)
 2018-10-07 03:25:10 +00:00
DisherProject
b14cbfb715 SoF S5: Place the elvish encampment when the leader arrives 
So remove his starting castle from the map; otherwise the user
would see an empty keep and would know where the enemy is
going to spawn

(cherry-picked from commit 5dc6b796d3183df9a41369c5380063245df9b9d7)
 2018-10-07 03:25:10 +00:00
DisherProject
95b3b954c7 SoF S4: Add the tunnel the dwarves came from to reach the mines 
(cherry-picked from commit 49d12cf1ef60bcd34dc1d7094408cee33355f87b)
 2018-10-07 03:25:10 +00:00
DisherProject
0f073b22de SoF S2: Place glyphs during prestart 
So we can see them while our ally is talking about them

(cherry-picked from commit 29cec1a77015fea916798890c362ea7573e10d32)
 2018-10-07 03:25:09 +00:00
DisherProject
201765740e SoF S1: Remove Caravans' upkeep cost 
In exchange, the player will have 2 starting villages
less than before

(cherry-picked from commit 76f081addf6772ab81c0921b1cf18e0def81ed9c)
 2018-10-07 03:25:09 +00:00
DisherProject
0844dfb8a3 SoF: General cleanup 
1) Clear variables and macros
2) Remove default AI values
3) S7: Remove the ghost ship

(cherry-picked from commit 9e8fb2d3e09b8c50a9eb1abd976efaf7d316ca66)
 2018-10-07 03:25:09 +00:00
DisherProject
1018585448 SoF S2t,S3t,S4t - Move scenery items to map file 
The braziers will also be animated, while they were still
images before

(cherry-picked from commit effb8650408c51bcd10c09c3f9448bdb953cc2b3)
 2018-10-07 03:25:09 +00:00
Severin Glöckner
a10888ca5b Micro AI Demos: use Cme instead of Chw for lurkers map 
[ci skip]

(cherry-picked from commit c5cabd960b257c258fda8e40d927ed427c595df9)
 2018-10-07 03:25:08 +00:00
Severin Glöckner
ccaa9b75ed Micro AI Demos: save maps in new format 
[ci skip]

(cherry-picked from commit c5d353988045c6f8099948a14c935507f80a7a39)
 2018-10-07 03:25:08 +00:00
josteph
6cc6fe8527 WML [message]: Limit the text width for messages with portraits on both sides as already done for messages with one portrait. 
(cherry-picked from commit 3809b64cf4ae2148f29e0f6bf621a7901d2698cb)
 2018-10-07 03:25:08 +00:00
josteph
b7964a1002 WML [message]: Add left padding when the portrait is shown on the right. 
The text is now shown at exactly the same place regardless of which side
the portrait is on.

Fixes #1938.

(cherry-picked from commit fc9e5f0484bf4718390ed3ab01d5ae418f9cfacf)
 2018-10-07 03:25:08 +00:00
joeylmaalouf
23df7b262f Menu: campaign order tweaks 
(cherry-picked from commit 243a542eddb6f4938563b1e4a83968ac1112a9cd)
 2018-10-07 03:25:07 +00:00
joeylmaalouf
1f1770362e Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222) 
(cherry-picked from commit a3a9b723115ae0cd5a5cf51ec1fd46af833b1ea3)
 2018-10-07 03:25:07 +00:00
josteph
b69baf5793 HttT S17: Show the 'Comic relief' comment to translators, too. 
(cherry picked from commit 31d333cc62b4a54c8d57bcbfc1ef425fd6b24d7d)

(cherry-picked from commit 046b141366bc1ef80d15447d46fc9d9fb33d0c10)
 2018-10-07 03:25:06 +00:00
josteph
d209d6eedb HttT S17: Make Li'sar's dialog unconditional. 
(cherry picked from commit 6ea39b33e690f796073e687896febb60785fb4d2)

(cherry-picked from commit c006072356737ef8199cb5a40e6aa626292e2553)
 2018-10-07 03:25:06 +00:00
josteph
1001e45dfa HttT S17: Add comic relief. 
(cherry picked from commit f3407fddc909fa05a34d34aee4afd2df7d30849e)

(cherry-picked from commit 7b2289f81843d5d9a040765cd071b50dc08ff9b8)
 2018-10-07 03:25:06 +00:00
josteph
657100ff09 HttT S17: Further updates to dialog 
- Improve Konrad's line
- Use variant portraits for Konrad and Li'sar
- Update the mage's dialog to match the dwarf's

(cherry picked from commit f7d8d0d25723e84f5fb2cf1a4a5343c263090410)

(cherry-picked from commit 15acd756361a907b9796450f0dd0560b7b20b78b)
 2018-10-07 03:25:05 +00:00
josteph
5787a8e4c8 HttT S17: Further tweak dwarf's dialog. 
(cherry picked from commit 3e3bd320c9488a0a0bc71a636d442d64f24a8c0a)

(cherry-picked from commit 865dcbf3a4fff005b7a5c74d5286cb163a4842b5)
 2018-10-07 03:25:05 +00:00