76627 Commits

Author SHA1 Message Date
Glen Whitney
b91b5095e5 Work around issue #4908. 2020-05-21 11:23:23 +02:00
nemaara
b331a08caa
Merge pull request #4882 from IskarJarak/small_fixes
Sceptre of Fire: bug fixes and small tweaks to dialogue
2020-05-20 16:51:37 -04:00
Iris Morelle
ddf818764f Sync changelog from 1.14 branch
[ci skip]
2020-05-20 16:23:51 -04:00
Lukas Jox
088aacb95f SoF S8: move keep to prevent dragon from suiciding 2020-05-20 14:18:02 +02:00
Lukas Jox
e6be90afc0 SoF epilogue: add mention of Thursagan
Co-authored-by: nemaara <nemaara@users.noreply.github.com>
2020-05-20 14:17:50 +02:00
Lukas Jox
7e61192350 SoF S5: typo fixes and small dialogue tweaks
Co-authored-by: nemaara <nemaara@users.noreply.github.com>
2020-05-20 14:17:28 +02:00
Lukas Jox
7e00c45e66 SoF S4: prevent resource spawn on castles 2020-05-20 14:17:17 +02:00
Lukas Jox
7a16f30c61 SoF S3: tweak dialogue, add event to tell players about the rune shop 2020-05-20 14:17:12 +02:00
Lukas Jox
c17906db6e SoF S2p5: slightly tweak victory condition 2020-05-20 14:17:08 +02:00
Lukas Jox
3a81cb4468 SoF change all mentions of dwarvish 'tribes' to 'clans' 2020-05-20 14:17:03 +02:00
Lukas Jox
6dd916283c add modify_unit tags added in 1.15.3 to schema validation 2020-05-20 14:16:58 +02:00
Severin Glöckner
6d68d82d88 HttT: makings some events more translation-friendly
The fiters restrict the events for exactly one particular unit.
Filtering the messages also by the unit id unstead of the generic "unit" variable
shows in the translation file who speaks the message - instead of the generic "unit"
shown otherwise.
[ci skip]
2020-05-19 13:50:12 +02:00
Severin Glöckner
098ea67d82 NR: correct file extension
Found by Debian's Lintian.
[ci skip]
2020-05-19 13:49:54 +02:00
Charles Dang
7068c5849e Don't specialize boost placeholders in the global namespace in 1.73 and up
See 2797f0dc33
2020-05-18 08:22:41 +11:00
newfrenchy83
7a86bd5385 fix inversion of [filter_weapon] and [filter_second_weapon] for animation
i forgeted to inverse value for animation
2020-05-17 19:40:51 +02:00
Glen Whitney
f3a472ab96 Modify GUI2 config files to scale font size with screen pixel pitch
These changes to the data/gui subdirectories make it so that above a certain
  screen pixel dimensions (currently 1200x900), text font sizes will be scaled
  with the pixel pitch of the SDL video device. In addition, several dialogues
  (such as the unit recall window, for example) are allowed to take on larger
  pixel dimensions to accommodate the larger (in pixel size) fonts.
2020-05-16 15:01:01 -05:00
Glen Whitney
49d8779ff1 Allow formulas to compute GUI2 text_font_size and window maximum_height and maximum width
In order to modify the GUI2 configuration files so that text_font_size can intelligently
  scale with monitor characteristics, it's necessary to allow the text_font_size,
  maximum_height, and maximum_width to be specified by WFL formulas rather than just
  numerical constants. This commit makes that possible. In addition, it computes and exposes
  the pixel pitch of the SDL display (in microns per pixel) in the variable
  screen_pitch_microns for use in these formulas.
2020-05-16 15:01:01 -05:00
Glen Whitney
6a729df4c0 Differentiate divide by zero errors
When debugging formula problems, it is convenient to be able to pinpoint at what line in
  the code an exception was thrown. This commit differentiates two divide by zero errors
  to facilitate that.
2020-05-16 15:01:01 -05:00
Glen Whitney
399fd8adf9 restore inadvertent changes of some tabs into 8 spaces 2020-05-16 15:00:48 -05:00
Glen Whitney
43de778c6a Allow theme resolutions based on an arbitrary base resolution.
Prior to this change, the 1024x768 base resolution (found in the default theme)
  was hard-coded into theme.cpp; resolutions beyond that were always scaled as if they
  had been defined on a 1024x768 base resolution, even if the width and height specified
  in the theme file were different. Combined with the scaling arithmetic in theme.cpp,
  this assumption resulted in bugs such as panels disappearing whenever their width in the
  base resolution specified in the theme exceeded 1024 pixels or their height exceeded 768
  pixels. This change records the base resolution from the theme in the theme and all of
  its objects, so the scaling computation can be done correctly.
2020-05-16 15:00:48 -05:00
Nils Kneuper
44be67b6fa updated Czech translation 2020-05-16 11:49:40 +02:00
Nils Kneuper
85706d8699 updated Esperanto translation 2020-05-15 22:38:55 +02:00
Pentarctagon
fd3f35b66f
Add links to the Windows/macOS readme files.
Also add a few more entries scons/cmake options.
2020-05-15 15:00:52 -05:00
Pentarctagon
d9fba7dd92
Remove VC12 reference - this no longer exists on master. 2020-05-15 14:39:08 -05:00
Pentarctagon
62d0ad4907
Update readme for vcpkg. 2020-05-15 14:06:57 -05:00
Nils Kneuper
a6a3d4686a updated Japanese translation 2020-05-15 20:42:44 +02:00
Nils Kneuper
126f620c89 updated Hungarian translation 2020-05-15 20:39:41 +02:00
Nils Kneuper
d8ee521df1 updated Polish translation credits 2020-05-13 22:00:16 +02:00
Nils Kneuper
67f51be68e updated Polish translation 2020-05-13 08:25:30 +02:00
Nils Kneuper
9fad4670a6 updated Spanish translation 2020-05-12 19:30:38 +02:00
Nils Kneuper
47ac1e4bbe updated Portuguese (Brazil) translation 2020-05-12 19:29:02 +02:00
Lukas Jox
05c30fb936 SoF utils: add macro to clear rune variables after scenarios 2020-05-11 15:11:13 +02:00
Lukas Jox
81b3290085 SoF: fix wrong word in campaign description 2020-05-11 15:11:13 +02:00
Pentarctagon
89393670c3
Enable LTO on a travis job.
With GCC 9, enabling LTO no longer causes the boost unit tests to segfault and also doesn't increase the build time to the point that a full rebuild times out.
2020-05-10 02:36:57 -05:00
Pentarctagon
6eeab88c5e Add additional translations steps for cmake to travis. 2020-05-08 16:19:30 -05:00
Pentarctagon
b1db683698
Remove old Ubuntu 16.04 dockerfile. 2020-05-08 15:32:19 -05:00
Nils Kneuper
effef1c38e updated Chinese (Traditional) translation 2020-05-07 22:57:40 +02:00
Nils Kneuper
bfe07839c5 updated Italian translation 2020-05-07 22:55:49 +02:00
Nils Kneuper
b2f29027b7 updated British English translation 2020-05-07 22:54:23 +02:00
Nils Kneuper
3812ec953b updated Portuguese (Brazil) translation 2020-05-07 22:51:03 +02:00
Steve Cotton
6d6414d068 Add comments about minimap.cpp's use of "team colors"
Maybe the "team_rgb_range" should be renamed as "named_color_range", because
it's used for everything defined by the WML `[color_range]` tag. In addition to
the ones normally used for teams (`red`, `lightblue`, etc) it has the minimap
colors for `reef`, `cave`, etc.

Separating the team colors from the terrain colors probably shouldn't be done.
Looking from the opposite perspective, using the terrain colors as team colors
has been discussed on the forums and found to be a useful feature:

* https://r.wesnoth.org/p627592
* https://r.wesnoth.org/p627588
2020-05-07 15:12:34 +02:00
Gunter Labes
fece902b41
Remove tags without effect
No use in having two adjacent heights with the same terrain or road cost/village definitions for a terrain that is not generated.

Fixes #4886
2020-05-05 17:59:48 +02:00
doofus-01
3d17fe99e9
SoF - Sc 2p5 : fix typo in story text 2020-05-04 18:24:49 -07:00
gfgtdf
658fb2937c
don't heal units on recall.
There is no reason to do so since units get already
healed when advancing to the next scenario. Not
healing the unit gives more flexibility to wml authors
who might want the player to be able to recall injured
units by modifying the hp of a recall list unit or by using
`[put_to_recall_list] heal=no`


Furthermore this also doesn't match what is shown in the recall dialog.

Fixes #4888
2020-05-04 20:30:19 +02:00
Pentarctagon
f02a99785c Clang 10 warning fix: -Wstring-plus-int at src/lua/lundump.cpp:237. 2020-05-03 22:46:19 -05:00
Pentarctagon
72635ea845 Clang 10 warning fix: -Wdeprecated-copy. 2020-05-03 22:46:19 -05:00
Pentarctagon
8403b15ca2 Clang 10 warning fix: -Wrange-loop-construct. 2020-05-03 22:46:19 -05:00
Pentarctagon
d4adce6c86 Explicitly use python3 in translations.
Ubuntu 20.04 no longer has the python link or python2 by default.
2020-05-03 22:46:19 -05:00
Pentarctagon
03c5c1b7ea
Update travis to Ubuntu 20.04 LTS image. 2020-05-03 11:54:15 -05:00
gfgtdf
782f9ca98a add attacker and defender variables in ability formulas
Now formulas like "add=(attacker.level - defender.level)"
are possible in weapon specials that allow the author to compute
the abilities value based on the opponent. The main reason why i
choose for attacker/defender instead of self/opponent was thats
is easier to implement. (but using the self/student variable is
also possible to get a 'opponent' variable shoudl that be needed)
Also it is less ambiguous than 'self/opponent' in the case of
weapon specials that come from leadership-like abilities.
2020-05-03 18:25:42 +02:00