upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 15:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,958 Commits 60 Branches 374 Tags
Commit Graph

72958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
josteph
1bbd40b7fb HttT S17: Add po comment 
(cherry picked from commit b7c431e7b39418b23666e55f6286b1ad768e5979)

(cherry-picked from commit f1d20c1edb6872f63fb84286067782a2d29310f2)
 2018-10-07 03:25:03 +00:00
josteph
2a21549bcb HttT S17: Explain the lava mechanic 
Gameplay is not affected. The player can still lose units to {EXPAND_LAVA}.

(cherry picked from commit a3be91248753f9ddbc0d647a4d918e4f160b7d56)

(cherry-picked from commit de9541fd76fca9bd50e4bc71b85b2c95ded0e134)
 2018-10-07 03:25:03 +00:00
Jyrki Vesterinen
cfb8a63bfe Changelog entries for changes I committed 
(cherry-picked from commit 6234faa1002a1364c5893683b26770736e050c4f)
 2018-10-07 03:25:02 +00:00
gfgtdf
74d5c427c1 fix #3532 : oos error in mp campaigns. 
previously it would cause oos when a player that has not yet advanced to
the currrent scenario sends random seed requests.

(cherry-picked from commit d0c0f406f25ce7a24184e44194b5b22071ebbd53)
 2018-10-07 03:25:02 +00:00
loonycyborg
969fb71440 Prevent C++ exception from escaping from is_user_banned() 
(cherry-picked from commit 0b9565375f4c27f59043ede643f2d360f2d3eec2)
 2018-10-07 03:25:02 +00:00
josteph
f1e1a99bbd HttT S6: Support unlikely player behavior. 
Trigger the undead reinforcements even if the player skips the main cave entrance.

(cherry-picked from commit 95b3ccd9fe0ba5f185f749ceac88188be7b591d9)
 2018-10-07 03:25:01 +00:00
josteph
8e37c39f50 HttT S6: Trigger the additional undead as soon as the player touches the cave entry. 
Seen in :debug with a Nightgaunt. Not sure if it can happen in normal play.

(cherry-picked from commit 9509eecced0b46435870d06d47a322408064e09a)
 2018-10-07 03:25:01 +00:00
josteph
b46fedcd35 HttT S6: Allow canceling attack orders. 
(cherry-picked from commit e50b6fa7bd72287e57517740e24b47de4079d35a)
 2018-10-07 03:25:01 +00:00
gfgtdf
9d6613a8cc fix 3541 : crash in lua tstring comparision 
(cherry-picked from commit 69cdbe8da76e37d4bb827dad97ce99d4ef16cde2)
 2018-10-07 03:25:01 +00:00
gfgtdf
bc89512a5c add game_config.combat experience 
and make [harm_unit] use these values instead of hardcoded 8*level for
killing and level for combat.

(cherry-picked from commit 3591e82586896c8923de1d45cf9c30d25c522a3f)
 2018-10-07 03:25:00 +00:00
gfgtdf
21e6b399e8 fix #3396 lua_function= doesn't work in [effect][filter] 
unfortunately this adds an annoying const_cast. The old code 'worked around'
this by getting a nonconst reference to the same unit via the unit map,
which i think is not better just hides the issue.

(cherry-picked from commit 08b7d1b1ac2e469bab55c37fe73a40f0df603b04)
 2018-10-07 03:25:00 +00:00
Severin Glöckner
c48735c0fb Core Macro Reference: Fix hint 
[ci skip]

(cherry-picked from commit 00e41b9857e8dfdb5f603fe7d91a1a6e0725b8c7)
 2018-10-07 03:25:00 +00:00
Severin Glöckner
b881c0ec1a TSG S5: fix typo in comment 
[ci skip]

(cherry-picked from commit f358beda512f526992c7bd9d4fe3fbff685a7c3b)
 2018-10-07 03:25:00 +00:00
Severin Glöckner
4d15d7e601 ANL: remove superfluous temp variables 
The other variables in that event are not needed either, left them in for
readability for the time being.

[ci skip]

(cherry-picked from commit 7a29fc15b4a09837f4eaa2242ab5db4b230f4ef0)
 2018-10-07 03:24:59 +00:00
Severin Glöckner
5ad321654b core macros: don't clear nonexistant variable 
A leftover from the switch from {FOREACH} to [foreach]

[ci skip]

(cherry-picked from commit 001b444b10977051962572a991233553bd605384)
 2018-10-07 03:24:59 +00:00
Severin Glöckner
5aaccf2d2a MP Tombs of Kesorak: adjust comment, avoid darkening overlay 
A better image is needed, I remove the darkening overlay, because it would be
missleading when a Mage of Light affects this field.

[ci skip]

(cherry-picked from commit 0ef3c0d5f94f895c65598aee36d9ffde63d5766b)
 2018-10-07 03:24:59 +00:00
newfrenchy83
c1a70068d5 Lua API: implicitly clear animator after playing it (#3536) 
This prevents the animator from holding a strong reference to the target unit, which was keeping the unit object alive and thus preventing the unit halo, if any, from disappearing.

(cherry-picked from commit 7d6e2b2a10a61e1704c38ea7ee6aa34178a29b38)
 2018-10-07 03:24:59 +00:00
Charles Dang
489e958d9f Sync 1.14.4+dev changelog section 
[ci skip]

(cherry-picked from commit 6eba0cbace9ac43f3680f2c0a57c0f26a04421d6)
 2018-10-07 03:24:58 +00:00
Celtic Minstrel
1606fdd6b6 Allow lists in SLF location_id key (closes #3493) 
(cherry-picked from commit 354f24e926eec0c1e60cc1fab65dda223cfe15f5)
 2018-10-07 03:24:58 +00:00
Celtic Minstrel
42c48d1483 Move wmlxgettext to the data/tools directory so that it's automatically included in official packages 
(cherry-picked from commit 59e78e556593cea7650998611640aeff3a6b288f)
 2018-10-07 03:24:58 +00:00