upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 22:41:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,792 Commits 60 Branches 374 Tags
Commit Graph

28243 Commits

Author SHA1 Message Date
Wedge009
10e99924b5 Capitalise references to the Academy of Magic on Isle of Alduin, for consistency. 
Resolves #6310.

[ci skip]
 2021-11-23 14:08:02 +11:00
Wedge009
dcb127ffee Avoid unnecessary wording. 
[ci skip]
 2021-11-23 13:08:58 +11:00
Wedge009
5cda4f8089 Correct scenario count for SoF. 
Looks like scenario '2p5' introduced in #4609 wasn't included in the scenario count.

[ci skip]
 2021-11-22 19:35:27 +11:00
Wedge009
3922d04b44 Restore word mistakenly removed in 19a42e3ead717dc1808162168585abe8755df4a4. 
[ci skip]
 2021-11-21 22:07:37 +11:00
Steve Cotton
c449232730 UtBS: Use a lower-case letter for "taurochs" 
It's the name of a species, so lower-casing it is consistent with #6067.
 2021-11-20 00:54:53 +01:00
max-torch
78f37713f5 Define KeyboardInterrupt Exception Handler in wmlxgettext 
Note: The signal class object was used to avoid wrapping the entire main routine in a try...except clause.
 2021-11-17 23:08:37 +01:00
max-torch
e35690c8f9 Edit wmlscope KeyboardInterrupt Displayed Message 2021-11-17 23:08:37 +01:00
max-torch
74d8ac9e77 Edit wmllint KeyboardInterrupt Displayed Message 2021-11-17 23:08:37 +01:00
max-torch
56dc9830dc Define KeyboardInterrupt Exception Handler in wmlindent 
Note: The signal class object was used to avoid wrapping the entire main routine in a try...except clause.
 2021-11-17 23:08:37 +01:00
Wedge009
76fda0bf3d Refactor the boarding events for TRoW S8 Clearwater Port. 
Resolves #6298.
 2021-11-17 22:53:56 +11:00
Descacharrado
49e43694f4
HttT S05b - Added cracked temples (#6279) 
* Added cracked temples to core and to S05b in HttT

* Compressed png files
 2021-11-17 22:53:31 +11:00
Wedge009
541f0a1e73 Add po hints where self-referential troll names have been replaced with variables. 
[ci skip]
 2021-11-17 22:52:34 +11:00
Wedge009
4a3ddfb143 Refactor handling of allies in UtBS. Resolves #6158. 
With four potential allies in the campaign, there is a lot of dialogue duplication. This refactoring attempts to consolidate the text.
Additionally, the ally ID was recorded in the variable ally_name which can be confusing, so rename it to ally_id instead.
 2021-11-17 22:52:34 +11:00
Descacharrado
3b951350c8
UtBS S06b Fix Dwarf Sergeant confusing a dust devil or human for a troll (#6198) 
* Fix Dwarf Sergeant confusing a dust devil or human for a troll #6196
 2021-11-10 14:15:14 +11:00
Descacharrado
a351c78579
DM S07 Fix for player having to pass turn in order to meet alternative win condition (#6189) 
Closes #6173
 2021-11-10 12:50:08 +11:00
Wedge009
76d0f33e2c Rename kick attack for horses and wyverns. 
Makes attack name consistent with other weapon attacks and also avoids translation issues (resolves #6071).
 2021-11-10 11:25:39 +11:00
Wedge009
0709145670 Resolve title-screen vs main menu inconsistency. 
Discussed in #4390 and originally introduced in 7c8c3114.
 2021-11-10 11:20:33 +11:00
Alexander Lacson
cc608a1cd2
Make wmltools Forest avoid version control subdirectories (#6236) 
This also makes wmltools Forest avoid .DS_Store and Thumbs.db files.
 2021-11-06 23:19:14 +01:00
Steve Cotton
69ee817955
Remove the fast path of [modify_unit] (#6223) 
Always use the "slow path", because it stores and unstores the unit, triggering
the desired side effects of unstoring a unit.

Fixes issue #5133, and tests that with the new unit test.

Fixes bug #4978, that changing the facing wasn't updating the display.

This corresponds to 1.16's commit 13c5d8a96ead8d2a7f0435f60b8ec7f7e0af0972,
that commit merely disabled the fast path to be a minimal change.
 2021-11-05 21:39:38 +01:00
Charles Dang
65b7baab64 Orb Colors: fixed lack of borders on a label 
Also moved this row to the bottom for UI cleanliness
 2021-11-05 02:56:07 -04:00
Hejnewar
4fe7751158
Increase the limits of timer values that players can set 2021-11-03 16:07:41 +01:00
Descacharrado
4abe584a06
UtBS S06b: hermit enhancement and tentacle fix. (#6200) 2021-11-03 02:02:18 -04:00
Alexander Lacson
b99b089e90
Add Objective Note for Thursagan's Rune Mechanic (#6207) 2021-11-03 01:59:40 -04:00
Descacharrado
1b905240af
TRoW S19: Automatically collect chest at the end of the scenario (#6192) 2021-11-03 01:54:39 -04:00
Alexander Lacson
3a312f3703
SoF S4: Make mining gold and coal clearer (#6182) 2021-11-03 01:37:50 -04:00
Alexander Lacson
732559e8fa
SoF Add Rune Chest Objective Notes (#6208) 2021-11-03 01:29:33 -04:00
Tahsin Jahin Khalid
e8d841a392 [WC] changed heroes pools for the defiance faction 2021-10-31 19:59:03 +06:00
Tahsin Jahin Khalid
717f8ef5f8 [WC] add some minor adjustments to the new WC factions 2021-10-31 18:40:37 +06:00
Tahsin Jahin Khalid
f1313ff0f5 [WC] added a missing WC2 unit pair in The Empire 2021-10-31 18:26:35 +06:00
Tahsin Jahin Khalid
efb9c431ff [wc] ran wmlindent on files inside the era directory 2021-10-29 18:57:36 +06:00
Tahsin Jahin Khalid
5ad17db715 [wc] added the defiance faction to the WC era 
dunefolk+undead
 2021-10-29 18:48:24 +06:00
Tahsin Jahin Khalid
3ee980703f [wc] added missing recruit dune herbalist to marauders faction of wc era 2021-10-29 18:40:14 +06:00
Tahsin Jahin Khalid
098403ed0a [WC] changed leaders and random leaders for the marauders 2021-10-29 18:36:21 +06:00
Tahsin Jahin Khalid
268308cb06 [WC] added new faction The Marauders 
Dunefolk + Northerners
 2021-10-29 18:27:13 +06:00
Tahsin Jahin Khalid
66c18ec629 [wc] adjusted recruit list of artisans 2021-10-29 18:26:12 +06:00
Tahsin Jahin Khalid
512526b4b5 [WC] renamed aristocrats to artisans 
reasons: Community suggested name change
 2021-10-29 18:09:36 +06:00
Tahsin Jahin Khalid
655dead2e0 [WC] run wmlindent on the WC factions directory 2021-10-29 16:36:52 +06:00
Tahsin Jahin Khalid
10a4de1647 [WC] adjusted empire faction pairs to reduce its weirdness 2021-10-29 16:34:54 +06:00
Tahsin Jahin Khalid
67fdcce6c9 [WC] included the aristocrats faction in WC era 2021-10-29 16:31:36 +06:00
Tahsin Jahin Khalid
fd7887d6a1 added the aristocrats faction 2021-10-29 16:30:55 +06:00
Celtic Minstrel
73983c7032 Lua: Fix nil-safety issues in location_set 
Fixes #6231

(cherry picked from commit 1f32466782e9f6089825b26631002e4000b5f73e)
 2021-10-29 11:56:43 +11:00
doofus-01
e2810bf96f SoF - S6 - fix #6146 and related side-storing issue causing auto-defeat (#6181) 
(cherry picked from commit 57078c4eb7d38a8c606776571bf9781c974a554d)
 2021-10-29 11:20:57 +11:00
doofus-01
bb05c1a9af 1.16 - terrain graphics variations and transitions (#6078) 
* some tent variations

* dead great tree variations

* Stone tile (Irs) to water/swamp transition, and raise Irs transition layers over swamp water and underground paths

* change when muted-blue waterfalls are applied

(cherry picked from commit 06b7efd77cab54797f12543823382a6fb9a5d377)
 2021-10-29 11:19:25 +11:00
doofus-01
3a78da72d3 1.16 sprint - naga stuff (#6076) 
* various small image fixes

* naga zephyr defense anim

* naga high guard defense animation adjustment

(cherry picked from commit ca91280807bd5680b6b814d55d32968535407310)
 2021-10-29 11:19:07 +11:00
doofus-01
9fb60ba160 1.16 Chasm terrain graphics updates (#6066) 
* muted-blues waterfall for swamp-chasm transition

* touchups to snow-chasm transition images

(cherry picked from commit b34b8a9dcdc68f131cd3e8e809f0c74a98b93656)
 2021-10-29 11:18:49 +11:00
doofus-01
615207c2ce 2p_Aethermaw - fix sprit decorations above fog 
(cherry picked from commit 8042db88e917d3d58492cb4257d70ce5e4ddecda)
 2021-10-29 11:18:35 +11:00
doofus-01
a4a5b60c14 Naga Sicarius sprite (#6056) 
* update naga sicarius sprite, including attack/defense animations

(cherry picked from commit 9a36ff4d8c27d6747ea172944b20bb4462ad10c0)
 2021-10-29 11:17:54 +11:00
doofus-01
61570bf5ab ran woptipng on the forest terrain images 
(cherry picked from commit 5643f97c3b79feeec3389a4fd615e499d62038ef)
 2021-10-29 11:17:30 +11:00
doofus-01
0ff21793f3 lower isolated pine trees within image 
(cherry picked from commit c658e3ed5ae666178080a4216f2bec96121aa3a8)
 2021-10-29 11:17:30 +11:00
doofus-01
6b492a8d5c naga sprite animations (#6027) 
* revised naga ophidian sprite, and added defense and attack animations

* ran woptipng

(cherry picked from commit 2ed26f609cba7c649c74fe9d5bcfa9fe1f5ec87b)
 2021-10-29 11:16:08 +11:00