Commit graph

24919 commits

Author SHA1 Message Date
Iris Morelle
36cf8c8d70 gui2/game_load: Constrain leader sprites to 72x72 using image path functions
Fixes #3474.
2018-08-17 15:45:20 -03:00
Konrad2
cf999f7365 Made Thursagens words fit the timeframe 2018-08-17 18:52:41 +02:00
sigurdfdragon
638fd4bda0 Fixup ed50b6b
[ci skip]
2018-08-15 23:13:55 -04:00
mattsc
d4213371b1 Fast Micro AI: fix for chance-to-hit specials without id
All mainline chance-to-hit weapon specials have ids, but it is not required for UMC specials.
2018-08-15 12:13:55 -07:00
sigurdfdragon
ce6826d80e Units: Have Saurian warriors be female to fit lore in mainline
Fixes #3392 & goes along with #3372.
2018-08-14 23:12:11 -04:00
sigurdfdragon
ed50b6bec4 Help: Add Saurian race description (fix #3372)
[ci skip]
2018-08-14 23:08:09 -04:00
gfgtdf
7d44782e5c fixup [terrain_mask] 2018-08-13 17:53:16 +02:00
gfgtdf
09c56ef2fe move [terrain_mask] to lua
and implement it using wesnoth.terrain_mask.

This also fixes an issue where [terrain_mask] would not remove
removed villages from the teams villages list after [terrain_mask].

This also adds an alignment parameter to [terrain_mask].
2018-08-13 15:25:41 +02:00
Elvish_Hunter
b1ec52cab8 wmllint: added [lua] to the allowed children of [if] 2018-08-12 23:10:09 +02:00
Elvish_Hunter
6e696661fd wmllint: don't even try to convert _info.cfg 2018-08-12 23:10:09 +02:00
Elvish_Hunter
2d045f2a6a wmllint: do not warn about unknown IDs in [tunnel], except inside of [filter] 2018-08-12 23:10:09 +02:00
Elvish_Hunter
2dda3280c1 wmllint: do not warn about unknown IDs in [remove_event] 2018-08-12 23:10:09 +02:00
Elvish_Hunter
9b5c0dda5c wmllint: do not warn about unknown IDs in [aspect] 2018-08-12 23:10:09 +02:00
Martin Hrubý
7dcc0d4696 Fix for #3444 (#3449) 2018-08-11 11:28:43 +02:00
Severin Glöckner
cd5b3f785e use & to denote team setup in MP
code it as & to avoid a pango warning in stderr
3ec26df changed it previously to '+' to work around that warning
also change it for the untranslatable strings in the credits
[ci skip]
2018-08-11 01:49:45 +02:00
Martin Hrubý
be0bd05ab0 Fix localised Multiplayer causes preferences window use scrollbar #2855 2018-08-09 22:13:33 +02:00
Elvish_Hunter
3b8a684551 wmllint: avoid inserting image=wesnoth-icon.png if there's already an image 2018-08-09 20:11:14 +02:00
Elvish_Hunter
c08963a2e7 wmllint: fixed 'unknown id' errors in [fire_event] referred to event IDs 2018-08-09 20:04:38 +02:00
Elvish_Hunter
cc178ad474 wmllint: fixed a regex that didn't match augmentation tags 2018-08-09 19:57:52 +02:00
Elvish_Hunter
8bea419899 wmllint: added side_name to the list of translatable keys 2018-08-09 19:53:06 +02:00
Elvish_Hunter
de99a38172 Prevent wmllint from converting Dunefolk names similar to Khalifate units 2018-08-08 22:12:36 +02:00
Elvish_Hunter
3caf128378 wmllint: added a missing conversion rule for the Qatif-al-nar unit 2018-08-08 22:08:59 +02:00
Steve Cotton
a6bd0c87ac SoF S9: Rephrase the intro text (fixes #3405) (#3437)
The original text that referred to Knalga was confusing if the
player thought of Knalga as "dwarvish territory", and most of
the campaign's scenarios have been somewhere in Knalga.
2018-08-06 08:34:53 +03:00
Konrad2
37ddf43d3a Updated credits for @Konrad22 (#3430) 2018-08-04 21:34:30 +11:00
Jyrki Vesterinen
fb5f46c52a Help: update the "Installing Add-ons" page (addresses #2703)
[ci skip]
2018-08-04 11:03:39 +03:00
Jyrki Vesterinen
40205c55fb Help: document cores (#2703)
[ci skip]
2018-08-04 11:01:47 +03:00
Steve Cotton
66c56403db SoF S4: Improved the reminder to recruit miners (#3422) (fixes #3394)
Updated to [allow_undo], because the hint message shouldn't block undoing a
recall.  Recruiting can't be undone, even with [allow_undo], so this isn't
allowing a cheater's opportunity to recruit units with desired traits.
2018-08-04 08:46:27 +03:00
Celtic Minstrel
ff4e1b2e61 Add new contributors since 1.14.0 to the credits
Anyone who prefers to be credited some other way (or whose name I misspelled) can feel free to open another PR

@Byteron @rrigby @DisherProject @Ferk @Konrad22 @lilinitsy @UnwiseOwl @bandita137@Ordoviz
2018-08-03 20:50:10 -04:00
sigurdfdragon
c6d2a0febc NR: Ensure Krash doesn't overwrite other units and is properly placed.
This could happen if a player has Krash and skipped S10a.
2018-08-02 22:57:08 -04:00
joeylmaalouf
4befb3580d NR S7-8: avoid recreating the new companions from scratch 2018-08-03 01:54:20 +02:00
joeylmaalouf
7c70c1d985 NR S7: give Stalrag traits for consistency 2018-08-03 01:54:20 +02:00
Konrad2
87eb901c10 SoF S01: Added snowy mountains to right map edge (#3401) (fixes #3383)
New map for SoF - Sc1 to fix #3383 (removing the fast way to reach the elvish leader, by replacing some regular mountains with snowy mountains).
2018-08-01 10:10:07 +03:00
gfgtdf
936516c83b fix game crashing when showing a too large tooltip
previously the game would go into an infinite loop at
https://github.com/wesnoth/wesnoth/blob/1.14.4/src/gui/widgets/window.cpp#L1046
when a tooltip doesn't fit on screen, this could in particular happen in
the mp lobby when hovering over the 'i' of a game that uses a ridiculous
amount of modifications.

I currently don't see any case where the game is actually able to 'fix'
a bad height that was reported from reevaluate_best_size. so i just
disable reevaluate_best_size for floating tooltips.

If there exists such a case, an alternative fix could be to change the
reevaluate loop in window::layout to also stop when a new iteration
returned the same size as the previous iteration.
2018-07-31 22:58:45 +02:00
Severin Glöckner
c2064827e4 THoT S6: minor changes for difficulty and map
Uses an Orcish castle instead of destroyes human. Troll would maybe fit best,
but it doesn't fit well with the surrounding. Has now only 2 castle hexes.

On easy difficulty, reduced turns by two, it should be enought turns.
Also added one more enemy, as there are less wolves spawned on easy.
And income for Gryphons once again increased by 1, they are very expensive.

Reminding events have been adjusted to turns.

[ci skip]
2018-07-30 17:25:26 +02:00
Severin Glöckner
390d66fda1 THoT S6: Let the AI avoid the mage's hut
Until he is found. This also means one less villages for side 2, increased
their income thatfor,

[ci skip]
2018-07-30 17:25:26 +02:00
josteph
92bb1c263b THoT S6: Now that the player is told which hut to look at, don't trigger Ratheln if the player ignores the hint.
Suggested by @sevu.
2018-07-30 17:25:06 +02:00
sigurdfdragon
46cc9a5289 SotA S21: Slight touchups
Only recruit level 2 to match what nagas arrive with.
2018-07-29 12:43:48 -04:00
sigurdfdragon
32a630bd3f SotA S21: Fix #3294 properly
It is the Saurians that have their males killed in S11, so the females
take revenge.
2018-07-29 12:43:41 -04:00
sigurdfdragon
7ced35839b Revert "SotA S11 & 21: Fix #3294"
This reverts commit a4bad90bad.

It is supposed to be the male Saurians that get killed in S11, and the
females seek revenge in S21.
2018-07-29 12:43:35 -04:00
josteph
f0ed45bde9 THoT S6: Let a Scout be the first to smell Ratheln's cooking.
[ci skip]
2018-07-29 17:51:33 +02:00
Jyrki Vesterinen
aa73b83600 Extend the first CVE-2018-1999023 unit test to also try loadstring()
Like @gfgtdf pointed out, loadstring() is still supported by Lua in the
name of backwards compatibility, even though it was deprecated in Lua 5.2
and is no longer mentioned in Lua manual. Thus, as of committing this it's
actually possible to load Lua bytecode.

Let's unit test this to ensure that we don't reintroduce this
vulnerability.
2018-07-28 08:12:48 +03:00
DisherProject
d13c451afb Liberty S8: Fix some event filters 2018-07-27 20:01:29 -04:00
DisherProject
f32dfaa917 Liberty S8: Remove unnecessary hidden side
Side 3 was composed by enemy reinforcements. Since they were
spawned on the right corner of the map, and since side 2
was blocked inside Halstead by and [avoid] tag, it was
necessary to add a new hidden side which could move freely
on the map.
If we upgrade the AI, removing the [avoid] tag, this hidden
side becomes unnecessary.
2018-07-27 20:01:29 -04:00
DisherProject
e63a15fc91 Liberty S8: General fix and cleanup to the AI goals
All sides will now head to the central fortress. Orcs
should now be a bit smarter, and they should not suicide
during the morning or the afternoon. The humans in Halstead
will initially remain inside their fortress, until the enemy
arrival.
2018-07-27 20:01:29 -04:00
DisherProject
4ced6c7526 Liberty S1-S7: Fire victory when enemies are defeated
Instead of checking whether there are no enemy units left
every time one of them dies, use the "enemies defeated"
event.
2018-07-27 20:01:29 -04:00
DisherProject
cbe2bcef6b Liberty S1: Filter event by condition instead of using an
if-then clause
2018-07-27 20:01:29 -04:00
DisherProject
ddf9949cff Liberty S5-S6: Replace deprecated keys
"share_maps" and "share_view" have been replaced in
favour of "share_vision"
2018-07-27 20:01:29 -04:00
Iris Morelle
3b91481a0c UtBS: Improve Eloh's attack animation timings
Also remove a Kate modeline I didn't intend to push.

[ci skip]
2018-07-27 19:32:30 -04:00
Iris Morelle
6e1a861bda UtBS: New graphics for Eloh by me
There are two layers of halos and they are applied in a somewhat
convoluted fashion. I should probably explain why.

The bottom halo is designed so it's drawn *below* the main unit sprite
so as to not muddle the colours on it. Halos are normally drawn *on top*
of sprites.

The back halo is specifically masked so it's drawn behind the main unit
sprite without overlapping any of its pixels, but it's asymmetrical and
supposed to flip along with the unit sprite depending on the direction
it's facing. Halos do not do that currently, at least not without using
animation WML conditionals. Unfortunately, for some reason, using a
standing animation that's nothing but conditionals causes the game to
crash at the moment.

Taking all this into consideration, using the blit IPF is a much easier
mechanism to avoid both issues at once, even if it makes the code
slightly awkward.

If someone can think of an alternative method, they're more than welcome
to change the code as long as the sprite's composition remains exactly
the same as it is now. I'm just the artist in this case.

[ci skip]
2018-07-27 19:08:38 -04:00
josteph
a08b7c3ab3 THoT S10: Clarify objectives.
[ci skip]
2018-07-27 23:03:50 +02:00