upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 19:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,978 Commits 60 Branches 374 Tags
Commit Graph

72978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Iris Morelle
7e4d12e10d pofix: 1.14 announcement rules for 1.14.5 
[ci skip]

(cherry-picked from commit 2ea2a4da4968ffc274757271ebe006a795cae955)
 2018-10-07 03:25:18 +00:00
Iris Morelle
c3446eba22 Multiple fixes to the changelog to make it look good on Steam 
[ci skip]

(cherry-picked from commit 7bb419abbf76ca2b88fd3fee4b66a5152732133e)
 2018-10-07 03:25:17 +00:00
Iris Morelle
daf40f637c Fix changelog indentation 
[ci skip]

(cherry-picked from commit a38466d0b50326ba3d5027f7253096340580848e)
 2018-10-07 03:25:17 +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
Jyrki Vesterinen
13f2adf0f3 Synchronized changelog with 1.14 
[ci skip]

(cherry-picked from commit 57709d4ae4845d43c512da292dc95de8f2fc2ea6)
 2018-10-07 03:25:16 +00:00
Nils Kneuper
3d556e0a30 updated Hungarian translation 
(cherry-picked from commit c1ffe4ce395e922f99099da99cbb1e41d602f78f)
 2018-10-07 03:25:15 +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
josteph
19479d70bd Add const annotation to new function 
(cherry-picked from commit 9f58a8063561a1ce4897fa88c1982e68dece33bc)
 2018-10-07 03:25:14 +00:00
josteph
4b29bd7fa2 Reevaluate [show_if] conditions and delayed variable expansions before displaying objectives at start. 
Fixes #3544.

(cherry-picked from commit d99f5b8a7689ab939f76d47535d1ff0ce6d625cf)
 2018-10-07 03:25:14 +00:00
Nils Kneuper
a98e7af336 updated Japanese translation 
(cherry-picked from commit 389cd9a8315fbd4f1d8abbba04db23428dbd1819)
 2018-10-07 03:25:14 +00:00
Nils Kneuper
f6390ac2e5 updated Scottish Gaelic translation 
(cherry-picked from commit 7ac40296b1193d966d0135122769e5f913be7fb3)
 2018-10-07 03:25:13 +00:00
Nils Kneuper
2ccd30b7ed updated French translation 
(cherry-picked from commit 235a54a050d3d431b4c8c0896c1d474b5b2c0bca)
 2018-10-07 03:25:13 +00:00
Nils Kneuper
3f44f76e21 updated British English translation 
(cherry-picked from commit eadbb1e086ca8ffb18f02a310d4d7316c34b8e51)
 2018-10-07 03:25:12 +00:00
Nils Kneuper
ab1db38a37 updated Czech translation 
(cherry-picked from commit 918a812027f4d7e5219b71a46a795fc3bf1473fd)
 2018-10-07 03:25:12 +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
Łukasz Hryniuk
1c57944c87 gui2: indicate that unit cannot advance 
(cherry-picked from commit 7cf478e8d91eaefccce110d281790a8e3a4574e4)
 2018-10-07 03:25:07 +00:00
Celtic Minstrel
317ef288c5 Update changelog 
(cherry-picked from commit 100565c7d8eb0f67473a8b370495449397fd69af)
 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
josteph
778080121f HttT S17: Correct pronoun. 
(cherry picked from commit 96387a55d559de4e4aba4c81e788ee1b50f27a88)

(cherry-picked from commit 0e9e3b30f97300adec6e344be0fd11b4b3bb874d)
 2018-10-07 03:25:05 +00:00
josteph
cebe98cc16 HttT S17: Add a po comments 
(cherry picked from commit edcccc56a7b9bffdb78d20aa6cf10086e5f9da5b)

(cherry-picked from commit 960a8fcc9fcc694898e934a990f3c29cfffebec3)
 2018-10-07 03:25:05 +00:00
josteph
d10c833c4b HttT S17: Change again due to an ambiguity. 
(cherry picked from commit 18e886d82e3a192a82baea6d6f036e656836dc7f)

(cherry-picked from commit 25791d64e579de1ba2fe53043598923fd32282fc)
 2018-10-07 03:25:04 +00:00
josteph
1e4c51faf0 https://github.com/wesnoth/wesnoth/pull/3473#discussion_r211090169 
(cherry picked from commit bc52143390debcc165aa234616c174072aeb1b97)

(cherry-picked from commit c97fe98801b6629797afbb6ae797c444a24df034)
 2018-10-07 03:25:04 +00:00
josteph
d456fe07b6 HttT S17: Explain why Mages of Light aren't considered by the filter. 
(cherry picked from commit 4c2f4f7eda28cfaacd512153099df056100e602c)

(cherry-picked from commit 0a0920fe79960d8886fc63d70e05c80a4d88826b)
 2018-10-07 03:25:04 +00:00
josteph
983972d949 fixup 
(cherry picked from commit 62eb450da6319413f1f7adec75a30177aba00dc9)

(cherry-picked from commit 2c9aeec8b0eb47fd8d16d3242b47e27981395bc6)
 2018-10-07 03:25:04 +00:00
josteph
083514231c HttT S17: Fix "naught" and explain why only high-level mages. 
(cherry picked from commit 7ed9f2db9ad958286fb896d0930952c03614a954)

(cherry-picked from commit fff478112c6e7d790cee2df2103a4e55924cb3be)
 2018-10-07 03:25:03 +00:00
josteph
13b00364e3 units: Add a po comment in Elvish High Lord. 
(cherry picked from commit 1f0c466a3d806a89ce8069b464e357797799f06e)

(cherry-picked from commit 9072934d45a2db49053d511c2d8c5db8b707f34d)
 2018-10-07 03:25:03 +00:00