Commit graph

26230 commits

Author SHA1 Message Date
pentarctagon
0f5b684830
Fix Vampire Bat being listed twice.
It should be Blood Bat instead.
2019-09-02 15:19:35 -05:00
Celtic Minstrel
8ce01da249 wmllint: Treat .mask files as maps 2019-09-02 12:48:01 -04:00
Celtic Minstrel
9be9dd931d wmllint: Fix some warnings detected by pylint 2019-09-02 12:47:58 -04:00
nemaara
8bdd2e6764 THoT S10: change orc leader reference (fixes #4295) 2019-08-30 23:52:39 -04:00
nemaara
f5f5da0828 Masked Ulfserker: fix advancement path 2019-08-30 23:50:00 -04:00
Celtic Minstrel
a127eb07b3 Add a schema for the diff format 2019-08-30 23:36:32 -04:00
Celtic Minstrel
b08677c678 Fix erroneous comment 2019-08-30 23:23:10 -04:00
Steve Cotton
1c123fb3fa Allow '1-infinity' in ranges, and tighten the schema's validation of ranges
Fixes #4253.

The schema's validation of ranges now rejects negative numbers, because the C++
code doesn't support them (both before and after this commit):
* utils::parse_range("-7") will return {0,0}, because std::stoi("") throws invalid_argument.
* src/map/location.cpp will parse it as -7, but that will never match an on-map coordinate
2019-08-29 22:28:22 +02:00
nemaara
d3d3c040f5 THoT S6: remove unnecessary avoid location 2019-08-29 12:02:55 -04:00
Charles Dang
3ee7e1a31c Updated credits
[ci skip]
2019-08-29 23:01:41 +11:00
nemaara
af2aaf4ba6 THoT S4: remove unused ai tags 2019-08-28 21:53:21 -04:00
nemaara
7044775338 THoT S1: give Movrur silver crown 2019-08-28 10:47:14 -04:00
nemaara
1ce93621e1 THoT S6: remove invisible village 2019-08-28 10:47:03 -04:00
nemaara
f429d88385 DiD S11: fix typo 2019-08-27 23:24:57 -04:00
nemaara
f54fd954ae THoT S5: fix typo 2019-08-27 22:24:53 -04:00
loonycyborg
4830c76f45 pot-update and regenerate doc files 2019-08-27 22:48:58 +03:00
ForPeace-Wesnoth
9c002697c0 objective update #4254
#4254
2019-08-27 03:23:22 -10:00
ForPeace-Wesnoth
24ae649ff7 remove bonus objective once it's completed 2019-08-27 03:17:28 -10:00
Wedge009
ff772b1be8 Add game_created sound key
See #4260 for details.

[ci skip]
2019-08-27 13:41:01 +10:00
Wedge009
9dd6f70c98 Change game_created event sound to join.wav on @stevecotton's suggestion. 2019-08-27 13:41:01 +10:00
Wedge009
e4e260709a Address comments against #3246 in order to resolve #2016.
* Remove unused notify_mode.NOTIFY_COUNT.
* Remove obsolete comment against mp_ui_alerts::items.
* Remove unused is_lobby parameter in mp_ui_alerts::game_created().
* Synchronise game_created sound in game_config.cfg with game_config.cpp.

(cherry picked from commit abaa77f7c6)
2019-08-27 13:41:01 +10:00
ville
169cff9ec7 Adds a preference item for a sound being played and desktop notifications in the lobby when a new game is created.
Remove unnecessary blank lines and debugging comments

- Adds a preferences entry in the multiplayer/alerts menu so sounds and desktop notifications can be toggled.

Reformat a few points for consistency

Have desktop notification show name and scenario of new game

Have desktop notification show name and scenario of new game

Update desktop notifications to use VGETTEXT for translations

(cherry picked from commit af71dbf1b1)
(cherry picked from commit a2d9943286)
2019-08-27 13:41:01 +10:00
gfgtdf
6ba25a8c64 overlay= related wml cleanups 2019-08-25 22:29:49 +02:00
gfgtdf
8610cc0a15 use [modify_unit] over store+unstore 2019-08-25 22:29:49 +02:00
gfgtdf
ef06634485 use overlay effect over [unit] overlays= 2019-08-25 22:29:49 +02:00
gfgtdf
aa07ec7915 add new macors to replace loyal trait. 2019-08-25 20:35:28 +02:00
gfgtdf
f4ad4f11c7 use [remove_trait] to remove loyal 2019-08-25 20:35:28 +02:00
gfgtdf
5cb93694c6 move loyal overlays to the loyal trait
since the recent changes to overlays= in particular 1a7724e547,
e71033374c and b2cd1cf6c [unit]overlays= is no longer the
recommended way to add an overlay and the use of the
apply_to=overlay effect is reccomended instead, so adding it
to the [trait] is the most natural option here.

this in particular fixes #4058 . Also people simply forgetting the
IS_LOYAL macro was a not-so-uncommon cause of bugs.

In some cases people want to give the LOYAL trait without giving the
loyal overlays for those cases i added a optional OVERLAY parameter to
the {TRAIT_LOYAL} macro, also heroes should now use {TRAIT_LOYAL_HERO}
instead which uses the hero overlay. The IS_LOYAL and IS_HERO macros are
no longer needed in combination with those traits.
2019-08-25 20:36:35 +02:00
gfgtdf
26c2f941f2 use [remove_object] over [remove_unit_overlay] if possible
this just prevents the units wml from getting cuttered with many [objects]
(generated by the [unit_overlay] implementation) that cancel each other out.
(in the cases here it shouldn't really be a problem though, i still did it
because it feels clener this way)
2019-08-25 20:35:28 +02:00
gfgtdf
a86df6c984 utbs: use [object] for dehydration implementation
this in particular makes it compatible the umc code that uses [remove_object]
It also makes the implementation a bit easier since we don't have to compute
things manually anymore, also duration=scenario takes care of cleanup at
scenario end.
2019-08-25 20:35:28 +02:00
gfgtdf
ce5696f334 add duration= key to [unit_overlay] 2019-08-24 22:19:58 +02:00
gfgtdf
5442d922c4 add [unit_overlay] object_id= attribute
with this the object can be removed with [remove_object]
2019-08-24 22:19:58 +02:00
gfgtdf
2117ce8332 new tag [remove_trait] 2019-08-24 22:19:58 +02:00
gfgtdf
fbdd926e14 improve [modify_unit] [status] implementation 2019-08-24 22:19:58 +02:00
gfgtdf
5b73c34798 overlays=".." -> {IS_LOYAL} 2019-08-24 22:19:58 +02:00
gfgtdf
308075ce67 formatting 2019-08-24 22:19:58 +02:00
gfgtdf
671f1efc40 formatting 2019-08-24 22:19:58 +02:00
gfgtdf
8a33ad0bf1 fix #4256 wesnoth.require with relative paths
now wesnoth.require is able to detect when the same file is
required two times using different names (like a/../a/b.lua
a/b.lua) and will only execute it once.

for this a new function wesnoth.canonical_path was added
2019-08-24 18:52:14 +02:00
gfgtdf
527f0a7580
fix [terrain_mask]
previously it would just ignore all [rule]s
2019-08-20 19:58:59 +02:00
sigurdfdragon
3741aeca57 DM S21: Better indication that the book has gone missing
Fixes #4220
2019-08-19 23:08:59 -04:00
sigurdfdragon
c75e33246e DM S20: Improve leveling of units and give player a note about it
Fixes #4219
2019-08-19 23:01:08 -04:00
Earth-Cake
943ff5dfe2 Merge Wose Shaman animations from Earth-Cake's PR #4229 2019-08-18 01:50:42 +02:00
Severin Glöckner
c19fd94bf0 ANL: use default AI
main difference: Lvl 2 units are recruited in lategame

[ci skip]
2019-08-17 23:58:31 +02:00
Pentarctagon
93dff47a75 Make [option]'s message and description attributes equivalent.
Also removes the deprecation message for the message attribute.
2019-08-17 15:17:19 -05:00
Maximilian Fricke
eb5d5421ee Display settings: Adjust "Limit FPS" tooltip
Tooltip now mentions that the game must be restarted for the setting to
take effect. Also removed "to 100%" and "at high resolutions" as these
statements are not accurate.
2019-08-17 13:12:05 -05:00
Severin Glöckner
c1c8f8a20f units: changing undead representations of some
Scorpions: use spider, better than the humanoid
Wyverns: are a rather drakish species than gryphonic
Falcons: more of a huge bird than a tiny bat

Sand Scuttler: official name for the unit is now Scorpion, as
having both the variation and unit name being the same would
show the same name twice.
2019-08-17 19:44:01 +02:00
nemaara
2a90a6284a Move naga hunter portrait to core 2019-08-17 13:28:21 -04:00
Steve Cotton
840b8754b6 DM S22: Apply the weapon-change from S21 to S22 too 2019-08-17 18:20:23 +02:00
Nils Kneuper
f7d73e980e updated Turkish translation credits to restore a missing translator 2019-08-17 11:22:05 +02:00
Severin Glöckner
13626f4109 units: roc changes
- now beloning to monsters
- removed lvl 1 variant (there is only one sprite for both)
2019-08-17 06:03:47 +02:00