77101 Commits

Author SHA1 Message Date
Steve Cotton
ba690adc41 Save-loading: remove "under discussion", add hint about accepting losses
This removes some subtle todo text that didn't have a explicit "TODO" in
the text, although it was tracked as part of #4280. The discussion ended
without a conclusion about whether those statements were correct for all
mainline campaigns.

The existing text in this help topic represented paragraphs by having
translatable strings that start with whitespace (two newlines), as described in
issue #4480. As this commit already needed to change all but two of the
paragraphs, I've switched them all to using non-translatable paragraph
separators.  Even though the whole save-loading topic is new in 1.15, it has
already been translated in some languages, and making this consistent means two
unnecessary fuzzy strings. Sorry to the translators, but I think it's
worthwhile.
2020-08-19 16:11:35 +02:00
Nils Kneuper
4e36b2a184 updated Czech translation 2020-08-18 22:34:47 +02:00
Nils Kneuper
d9d13d5613 updated Italian translation 2020-08-18 22:32:58 +02:00
Nils Kneuper
db7b3c79fc updated Chinese (Traditional) translation 2020-08-18 22:31:55 +02:00
nemaara
ec779a1d6b Quenoth Druid/Shyde: rebalance line 2020-08-18 15:06:48 -04:00
nemaara
14dfae1690 Add spearmaster nerf to changelog 2020-08-18 14:53:12 -04:00
nemaara
4126a2ff58 Spearmaster: reduce shield damage 2020-08-18 14:53:04 -04:00
gfgtdf
954a1a7411
Update changelog.md 2020-08-18 15:11:42 +02:00
Pentarctagon
3c6217fc1c Update MP query scripts to report source add-on and version. 2020-08-17 16:38:23 -05:00
Lukas Jox
a2a09564af update changelog 2020-08-17 13:46:57 -05:00
Iris Morelle
a0fb9311e4 Remember when people were like "include stable changelog pls"
[ci skip]
2020-08-17 04:56:45 -04:00
Gunter Labes
6e60db597d
Use __WMLUNITS__ define for all parse calls
Enables workarounds for wmlunits in core unit files.
2020-08-16 22:43:14 +02:00
Severin Glöckner
b8219e50ab Macros: fix leaked variable in {HEAL_UNIT}
[heal_unit] set's as side-effect an variable, which contains the heal amount
of one of the healed units.
It's more likely that this will just add a variable with authors not being aware
to clean it afterwards, than the case being that someone want's this behaviour.

I assume that this happens is an unintended side-effect from former code refactoring,
the original implementation of this macro was not doing this.

[ci skip]
2020-08-16 13:45:17 +02:00
Severin Glöckner
0d2ed265a5 Monsters: change usage of some
[ci skip]
2020-08-16 13:43:26 +02:00
Steve Cotton
4a16b9d3ff
Help dealing with losses: remove todo for linking to the forums (#5077)
This simply removes the todo. Conclusions from trying to add a link:

* Any link should be to something more specific than the "Mainline Campaigns
Feedback" forum, which is a set of sub-forums that may or may not have any
recent and-or useful information for the particular scenario that the user is
having trouble with. For replays in particular, some (most?) don't have replays
that have been uploaded to the feedback threads, and given Wesnoth's
incompatibility with previous stable branches the replays that are there might
not be usable.

*`The forums are English, so might want a note in all the non-English
translations that isn't in the English text.
2020-08-15 22:57:48 +02:00
Steve Cotton
2546446122
Help about losing: remove reference to specific difficulties (#5076)
Part of resolving issue #4280.
2020-08-15 17:49:21 +02:00
Pentarctagon
5a77a86330 Have mainline content send [multiplayer][addon] info as well.
This commit:
* sends the era and scenario as part of a [multiplayer][addon] in order to make it consistent with how add-ons' information is sent to wesnothd. this means all of the game's content information is now available in the [multiplayer][addon] data.
* correctly covers the case of there potentially being modifications added to mainline at some point. the current code looks at the [multiplayer]mp_scenario= and [multiplayer]mp_era attributes to cover the case of a mainline era/scenario being used, but looks for modifications only in the [multiplayer][addon] data, which wouldn't have any entry for a mainline modification right now if one were added.
2020-08-14 09:03:18 -05:00
Steve Cotton
4a640274c5 MP dialog: typo fix 2020-08-13 19:46:13 +02:00
nemaara
1182c0d8e7 Liberty: typo fixes 2020-08-13 02:14:28 -04:00
nemaara
67458f82fd Nightblade: fix typo 2020-08-13 02:11:12 -04:00
nemaara
854b0eeb50 Scorcher: fix typo 2020-08-13 02:10:46 -04:00
Wedge009
06a046a44d Correct typo introduced in 48198469.
[ci skip]
2020-08-13 15:23:16 +10:00
newfrenchy83
2be22c8030
fix codeblock projectfiles (#5078) 2020-08-12 11:11:28 +02:00
doofus-01
ee6d86c20b
Various minor graphics fixes/updates (#5025)
* units - adult scorpion variant portrait

* units - revised portrait for naga dirkfang

* terrain - some dwarf castle floor transitions that were forgotten

* units - Revisions to Giant Scorpion portrait
2020-08-09 17:29:14 -07:00
Severin Glöckner
4f76aa672b The Wildlands — map tweaks
* the waterpath in the north is now continuous
* a few more embellishments

[ci skip]
2020-08-09 11:05:25 +02:00
Severin Glöckner
c0d05dcce6 MP: 5P The Wildlands
Fix Shuffling Sides with side 5 (which has no leader)
and refactor.
[ci skip]
2020-08-09 00:44:58 +02:00
Severin Glöckner
4c899d73d6 MP: 5P The Wildlands
Place units in a way which avoids jumping too much over the map.
[ci skip]
2020-08-09 00:44:58 +02:00
sigurdfdragon
8540dbbd24 Campaigns: List myself as former maintainer for two campaigns 2020-08-08 12:50:48 -04:00
Iris Morelle
ce1a1ec809 pot and documentation update 2020-08-08 05:35:45 -04:00
Steve Cotton
c9511d7ba0
Drop support for the l10n-track file (#4722)
The file only had a run-time effect if it listed any files as "fuzzy", which it
hasn't since the last change in 2015. However, that isn't a reason for removing
it.

The reason for removing it is that it doesn't make sense to automatically mark
images as fuzzy when an image changes, because fuzzy is often much better than
untranslated. This is different to the logic for strings, where a single word
can negate the meaning of a sentence. The decision has to be a manual process,
and at that point it might as well be done with the source-control tool's
delete-file function.

Even considering the previous times that l10n-track was used, I can't see a
scenario where it would be useful.

* Scenario: a screenshot needs to be replaced. In this case the new images are
  going to be screenshots too. If the old images are out of date, better to
  just delete them instead of needing the fuzzy mechanism; either option would
  have the same effect of showing the up-to-date-but-untranslated image.

* Scenario: a map is completely redrawn. This seems unlikely, as a completely redrawn
  image could be added as a new map rather than replacing the old one. Even if
  it does happen, it's probably best to just delete the old --overlay.png
  files.

* Scenario: a new landmark is added to a map. Using the existing overlay file
  is still going to be good, as it means the rest of the map is shown
  translated. There's surely new dialogue in the WML files commenting on this
  new landmark, which would be a good place to say
    # po: Lorem's Ipsum was added to the map on 24 Jan 2020, please add a label to your language's --overlay file.

* Scenario: an old feature is removed from the map. Using the existing overlay
  will have an out-of-date label, and the significance of that would depend on
  how it affects the storyline. This could be significant enough to make
  showing the English labels be a better option than showing the translated
  ones. However, the translated maps could be updated without knowledge of the
  language, so if it's such a significant change then the developer writing the
  new WML should probably do that.

* Scenario: a feature moves slightly on the map. This is an example where the
  l10n-track file has been used, it happened with the Bitter Swamp on the
  bottom-right corner of the title screen. I think it would have been better to
  show the slightly-out-of-date overlay instead of showing the English.

Note about cherry-picking: in the 1.14 branch, the change needs to be applied
to src/picture.cpp instead of src/filesystem.cpp.
2020-08-08 05:07:59 +02:00
Steve Cotton
711b9388e9
Fix the build, separate fixes for VC16 and GCC-10 (#5037)
I'm relying on Travis to check whether the VC16 fix is correct,
as I don't have a Windows install to test this locally.
2020-08-07 19:06:54 +02:00
gfgtdf
6d73033445
use shared_ptr for unit_ptr (#4985)
use shared_ptr for unit_ptr

This make the code a bit simpler, furthermore it
allows us to use weak_ptr to unit should we ever
need that.

Furthermore this adds a class shared_reference that wraps shared_ptr but can never be nullptr.
2020-08-07 14:30:40 +02:00
newfrenchy83
f33330de19
fix wesnothd and campaignd codeblock projectfiles after #5029 (#5035) 2020-08-07 11:18:05 +02:00
gfgtdf
50715621c7
fix crash when a unit_placed event kills a unit
fixes #5034
2020-08-07 00:35:41 +02:00
Severin Glöckner
8e9d4b1f82 MP: remove Xo overlay from border tile
seems to be misplaced.

[ci skip]
2020-08-07 00:06:31 +02:00
Severin Glöckner
c256c26f5e ANL: swap side 3 & 4
They are now placed clockwise.

[ci skip]
2020-08-07 00:03:44 +02:00
Severin Glöckner
a9ded0c14f ANL: switch to new castle terrain
It's having a few more glitches, but it may cause less glitches elsewhere,
as it are »real« castles, and the player can build castes adjacent

[ci skip]
2020-08-06 23:40:21 +02:00
Martin Hrubý (hrubymar10)
f28ef7026b
Fix Xcode project after #5029 2020-08-06 22:01:59 +02:00
Nils Kneuper
62551deed1 updated Turkish translation 2020-08-06 20:53:52 +02:00
Nils Kneuper
ea026b4f31 updated Spanish translation 2020-08-06 20:52:31 +02:00
Nils Kneuper
57177f6dbb updated Portuguese (Brazil) translation 2020-08-06 20:51:07 +02:00
newfrenchy83
e05be0b597
update codeblocks projectfiles (#5033) 2020-08-06 12:21:02 -05:00
Pentarctagon
46f74f0ebb Move campaignd and wesnothd files into more descriptive locations.
Also fix a few cases of not specifying the full path to header files.
2020-08-06 12:16:18 -05:00
Pentarctagon
35ed1ecb76 Stop and error the release windows job if there's not enough time to run the WML unit tests. 2020-08-06 12:04:34 -05:00
gfgtdf
904c997d3b
Fix crash in music_track code
appearently calling ov_clear when ov_fopen wasn't successful crashed the application.
2020-08-06 14:20:28 +02:00
Martin Hrubý
9f854e7ce8
Fix SDL2 2.0.12 change in SDL_GetDisplayDPI (#5024)
* Fix SDL2 2.0.12 change in SDL_GetDisplayDPI

Fixes #5019

* Remove signing requirement for DEBUG Xcode builds
2020-08-05 23:44:39 -05:00
DisherProject
18c487e4ff
Add JPG support to VC++2019 build (#5031)
* Add JPG support to VC++2019 build

Co-authored-by: DisherProject <pycchio@tiscali.it>
2020-08-05 23:43:38 -05:00
Steve Cotton
935fa41379
Final part of the Python 2 removal, including updating install-pytools (#5027)
Update the list of files installed by "scons install-pytools", dropping Python2
versions and adding their Python3 replacements. This doesn't update any
`import` statements, as the tools have already been ported to use the Python3
modules - the scons script was out of date and was still bundling the wrong
versions.

Note for anyone looking at the history - although most of the current
tools have a '3' in the name just to indicate that they're the Python 3 version,
there's a double-meaning to that number in wmlparser3.py's name. There was a
`wmlparser2.py`, where the `2` indicates a redesign of the original.

The data/tools/README.md file was renamed from plain README without being
converted to Markdown format. This commit touches about half of that file;
headings in that half are updated to be Markdown, but to reduce the diff the
other headings aren't updated.
2020-08-05 21:56:12 +02:00
gfgtdf
542b59cc65
fixup "fix crash when reading .po files"
accidentialyl removed a line
2020-08-04 20:37:11 +02:00
gfgtdf
5d4ab47913
fix crash when reading .po files
You may _never_ use the std:: file io functions
in wesnoth since they only support acii characters
on windows in filenames. We have fixed this many
times already but apparently the person that added
.po file support wasn't aware of this issue.

fixes #4965
2020-08-04 20:35:00 +02:00