5191 Commits

Author SHA1 Message Date
Iris Morelle
a6207f1642 Fix item names in the scenario editor not being localized
data/core/editor/items.cfg defines the names for the items. The file is
included by data/core/editor/_main.cfg, which has a #textdomain binding
to wesnoth-editor at the top. The strings end up bound to that
textdomain by the game, but wmlxgettext doesn’t have any way to see this
so it binds them to the default textdomain instead, which is wesnoth,
not wesnoth-editor. The game ends up looking for the strings in
wesnoth-editor instead.

The easiest solution right now is to explicitly bind items.cfg to the
wesnoth textdomain so as to not require moving catalogue entries in the
po files around to wesnoth-editor. It really should've been
wesnoth-editor in the first place but it's too late to fix that now
without giving translators a migraine. It's a pity either way given how
useless the scenario editor is in practice.

[ci skip]
2019-01-26 14:11:01 -03:00
Andrius Štikonas
ce8c8b74e6 Remove a stray foo. 2019-01-22 10:57:11 +11:00
Reuben Rakete
af4701c3e4 Update hotkey filter to work with multi menu toggles 2019-01-06 18:04:08 +00:00
Edward Chernenko
0112a82a35 Fix typo in menu_button: active icon was used instead of pressed icon
Icon [short_arrow_left_25-pressed.png] exists, but is not used anywhere.
Widgets in [menu_button_default.cfg] and [multimenu_button_default.cfg]
were using [short_arrow_left_25-active.png] for the "pressed" state.
2019-01-02 19:10:35 +02:00
pentarctagon
eb65c9b2ce Revert "Note dependencies on OpenGL and GLEW in INSTALL.md"
This reverts commit f31b477e5b6d04cf73118824a2155fc45637361a.
2018-12-31 13:31:59 -06:00
equal-l2
f31b477e5b Note dependencies on OpenGL and GLEW in INSTALL.md
They are required to build wesnoth client but not noted.
2018-12-31 10:41:34 +02:00
jostephd
21c20b951d
Help: Document campaign 'level' and 'difficulty'. (#3781) 2018-12-29 17:11:57 +00:00
newfrenchy83
550c686e7b fix value={CTH_NUMBER} forget in force CTH macro 2018-12-14 08:28:12 -06:00
mattsc
afb394c4b1
Merge pull request #3723 from mattsc/rca_ai_changes
Default AI changes
2018-12-02 08:42:42 -08:00
josteph
42853719b4 Help: Delete superfluous linebreaks. 2018-11-18 11:25:25 +00:00
josteph
35828b1d32 Help: Document more cases lit terrains. Linkify oasis 2018-11-18 11:02:55 +00:00
Celtic Minstrel
1d76a98041 Update credits for recent merge
@holius-fr
2018-11-17 23:28:31 -05:00
Celtic Minstrel
7b358440f6 Merge pull request #2664 from holius-fr/liminal_bonus 2018-11-17 13:04:49 -05:00
mattsc
c0bc8c548c AI: deprecate ai_depth related macros 2018-11-16 06:47:54 -08:00
Celtic Minstrel
866420adf8 Redesign force cth macro
Closes #3707
2018-11-15 21:17:04 -05:00
mattsc
8c8cafaa70 Deprecate EXPERIMENTAL_AI macro 2018-11-15 06:46:41 -08:00
Severin Glöckner
eb1ebe1cd8 Help: cut portraits of monsters, bats and zombies
This will less often wrap the text of the descriptions.

For many of the zombies is more possible, but it has been taken care to have the
linebreak for 'required xp' and in the variation list the same on all their pages.

The reason for the 319px height on some of them is:
- It's still taking enough space to have 'required xp' on a new line.
- It does for both the WC and Soulless not interfere with the description text.
- The swimmer can't be smaller than 319px without cutting any non-tranaparent
  pixel. To have more structure the goblin/dwarf/dog use the same.

[ci skip]
2018-11-14 23:45:45 +01:00
Celtic Minstrel
639787e1c9 Merge pull request #2562 from wesnoth/schema 2018-11-11 13:52:19 -05:00
newfrenchy83
5d6a6c0de1
Fix grammar in cth macro
Also fix whitespace errors from edab243b9d4e5bbac8b10e28fb0237e201392071 -- GL

Closes #3694
2018-11-07 15:32:22 -06:00
newfrenchy83
edab243b9d
Fix rare bug in FORCE_CHANCE_TO_HIT
If in attack end in FORCE_CHANCE_TO_HIT macro, unit or second unit doesn't exist anymore because rare case where unit disapear before attack end event was calledthen we have an error message like "Invalid WML found: [unstore_unit]: variable 'second_unit' doesn't exist" because presence of unit not condition of execution of event.
2018-11-06 15:15:40 -06:00
josteph
801e1c6234 WML: {REMOVE_LABEL} now takes an optional EXTRA_WML argument. 2018-11-03 18:16:43 +00:00
Celtic Minstrel
420afdf88e Deprecate {AI_CONTROLLER} and related macros (addresses #3668) 2018-11-02 23:54:53 -04:00
Martin Hrubý (hrubymar10)
de183eeb2d Include battery percentage into GUI and add 2 versions of battery icon 2018-10-30 07:14:42 +02:00
josteph
f1a5bd09e8 Merge remote-tracking branch 'josteph/forward-port-some-of-the-174'
* josteph/forward-port-some-of-the-174:
  don't call invalidate_layout() unless needed
  Convert a bunch more C-style casts I missed in 0dc5656 to static_cast
  fixup  don't show travis notifications from forks (cherry picked from commit 55bc62f442da47f0b754ed9b75238c5a53fd76dd)
  don't show travis notifications from forks (cherry picked from commit d6ab780ce94df14a6eb1eeb4df7ce2543fc27069)
  fix out of bonunds check
  Lua: Invalidate layout in set_dialog_value()
  Fix includes
  Implement iOS version detection
  Game Load: Use child_or_empty().
  Themes: Fix the observers icon being hidden under the minimap
  Game Load: Restore the ability to select 1.12.6 savegames in the list
  Fix CMake build on macOS
  NR S8: compatibility commit to make the new companions from scratch if we don't have them stored
  Partially revert "Additional village variations (#3342)"
  DM: Add last breath dialog for Zorlan
  DM: Generalize death message so it works when Delfador is young and old
  gui2/unit_recall: Change Recall button back to its correct label
  Updated changelog in Xcode
  Add WML unit test for unupgradable (#3336)
  gui2/unit_recall: Fix i18n issues
  DM: add some TODOs
  iOS: finger scrolling in controls.
  iOS document directories. Might use these on other platforms as well.
  .gitignore for CLion
  German multiplayer translation: fixes
  German translation: reword era descriptions
  German translation: fix a string
  Statistics Dialog: merge unit name and count labels
  add / remove some comments
  Tutorial Part2: Give the player a canche to undo his move
  UtBS 5: changes to scenario locations (#3104)
  Update changelog in macOS package
  SotA: transform bats already after the 5th scenario
  TRoW: revert workaround for #2912
  Changelog entry for the #2912 work around
  TRoW: Increase Rithrandil's workaround portrait height to 700
  TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912
  Add missing deprecation messages for deprecated macros
  Northern Rebirth S02_01: keep side 8 leader from wandering off too far
  changelog: remove AToTB AI entry
  wesnothd: prevent another instance of crash from owner not in player_connections
  Increased in-game chat size. This makes it render more smoothly
  Minor tweaks to classic theme (thanks enclave for doing this)
  Update RELEASE_NOTES (cherry picked from commit e2a2a85f16fb5984ad0e44b0ec3f16a5eb1ac823)
  Update changelog for custom AI for AToTB S2
  TRoW: revert changes, to avoid a potential OOS
  Re-apply patches to fix issues #2844 and #2846 in SotA
  Clear RELEASE_NOTES
  Repair 66ab35f in the upwards direction
  Add changelog for 1.14.0
  add placeholer links to appdata file
  Hide Editor help section
  UtBS: readd do_not_list
  UtBS: wmlindent pass
  Fix MP label for #2855
  Fixup 601c67d970c2eac
  UtBS: Re-added compatibility code to load old saves using the new elves
  Swap count and name columns in statistics (fixes #2893)
  Revert string changes in SotA for 1.14 RC 3 - gold
  AI recruitment: use unit-specific recall cost
  AI recruitment: fix units on recall list interfering with recruiting
  Fixup f7ab008 before GCC complains about an unused parameter >_<
  Help: disabled parsing error popup
  LoW: Fix translation error in conjunct list (fixes #2833) (#2834)
  Fix pofix
  Changelog entry for recent SotA fixes
  Pofix entry for fc6c3ac04b899b4c7f629a1cd8d80101c7cbb20c
  Pofix entry for b86a2968fe87a7e4112e900070446d4a83808202
  Pofix entry for ab9f29a7a44372a3e3703fd842740a9b425b6f5f
  Fix HP label in longer languages
  Help: removed sort_sections key with invalid value
  less redraw_everything calls when receiving [change_controller]
  fix gui2 dialog disappearing after [change_controller]
  Use a fallback for when the player name is not known in debug notifications
2018-10-30 00:07:10 +00:00
Victor Sergienko
b4ef4c9b34 iOS: Touch-hex action added. 2018-10-28 18:21:54 +02:00
Victor Sergienko
aedc081b2e iOS: Touch interface implemented, and a RMB emulation of such on PC. 2018-10-28 18:21:53 +02:00
ln-zookeeper
33c155e802 Partially revert "Additional village variations (#3342)"
The new images weren't supposed to go into 1.14, but the updates to the existing two hut images can remain.

This partially reverts commit a55e5228b2ea0248cee7cd78ee35d26cb407536e.

(cherry picked from commit 556d9ffb91cdf0376336366c1176009169dd6d5b)
2018-10-28 02:53:09 +00:00
Severin Glöckner
c260cd2529 add / remove some comments
[ci skip]

(cherry picked from commit df8ac3cbb0be62929d654108bfb28ae36c0b41ad)
2018-10-28 02:53:05 +00:00
Celtic Minstrel
bd2bf467a3 Add missing deprecation messages for deprecated macros
This also bumps ON_SIGHTING to level 2.
(cherry picked from commit f550f2d6f54778ae44560b3e1e2602064d63a9de)
2018-10-28 02:53:03 +00:00
Iris Morelle
e58098609d Hide Editor help section
See isssue #2964.

[ci skip]

(cherry picked from commit 722637c59ab6df18c8c1ec5176983fd6d5dc7817)
2018-10-28 02:53:00 +00:00
Charles Dang
05ad78335d Help: removed sort_sections key with invalid value
[ci skip]

At no point is "generated" checked for as value of that key (the only valid value is "yes").
"generated" is a valid value for sort_topics, however. As for whether we want sorting or not
for Eras, I don't think so. The era order as displayed seems logical enough since it groups
each era and Age of Heroes variant together.

(cherry picked from commit 6b20ccdb6282084b1fdb446d8a93d621204e8408)
2018-10-28 02:52:54 +00:00
nemaara
624872963c Update Elvish unit descriptions
Closes #3610
2018-10-24 14:54:54 -05:00
Celtic Minstrel
fb7dce076f Use WFL instead of Lua code for {SCATTER_EMBELLISHMENTS} 2018-10-23 22:41:52 -04:00
Celtic Minstrel
ea9d483149 [effect]apply_to=new_animation does not support name
It does support id though, which is used as a sort of caching mechanism
in case the same effect is applied many times, so use that instead of name.
For good measure, also use an id on the sceptre of fire animation
2018-10-23 22:41:48 -04:00
Celtic Minstrel
0fba06c977 Remove animate=no from {GUARDIAN}
This is the default in [unit] anyway, and if the user specified
animate=yes explicitly then we should not override that.
2018-10-23 22:41:38 -04:00
Celtic Minstrel
e2bc73b27b Add omitted final [] to [modify_ai] paths in core macros and UtBS 2018-10-23 22:40:01 -04:00
Celtic Minstrel
c2c540fa15 Fix error in AI control core macros 2018-10-23 22:39:49 -04:00
Celtic Minstrel
703d0c3cf4 Fix erroneous/useless [event] in [titlescreen_music], [lobby_music], [editor_music]
The playlist macros set the music list twice, once before the
story screen and again in prestart, but the order of tracks is different.

This means that the track order at the titlescreen and in the lobby is now the same
as the track order in a scenario using the default playlist, which previously was not the case.

Similarly, the track order in the editor is now the same as the track order
in a scenario using the full playlist.

Whether that actually matters? I have no idea. I doubt it.

In any case, as of this commit, there are no schema validation errors
at the title screen, when entering the MP Create screen, or in the map editor.
2018-10-23 22:38:19 -04:00
josteph
5e92b8e80d Help: Fix some broken links in the Gameplay section.
The abilities help topic id structure is intentional, according to
generate_ability_topics() (src/help/help_impl.cpp:514).
2018-10-22 00:10:28 +00:00
josteph
c9d4dde5ae help: Add "Great River" topic
Part of #2963
2018-10-22 00:10:28 +00:00
josteph
6dacbb9e46 help: Fix broken link
Reported in #2963
2018-10-22 00:10:27 +00:00
josteph
606ac386e1 Help: Fix fatal error in the "Recruiting and Recalling" page.
The error message was, upon opening the page:

```
Parse error when parsing help text: 'Error when parsing help markup as WML: 'Unexpected characters after variable name (expected , or =)
at <unknown>:2''
```

The <bold> tag in question can be seen on old_master_20181015 here:
71a6daf961/data/core/help.cfg (L199)
2018-10-22 00:04:35 +00:00
Celtic Minstrel
d10c51feb1
Make the fire terrains actually illuminate their hex
This covers the wall torch, the campfire, and the brazier.
2018-10-20 15:36:17 -05:00
Konrad2
fd0f7dc1a9
update credits
backport of #3430
[ci skip]
2018-10-18 15:28:15 -05:00
ln-zookeeper
71c6cdaa53 Updated Kwandulin's credits 2018-10-14 12:11:20 +03:00
Jyrki Vesterinen
1fd668bb1e Add @JGelfand to credits 2018-10-14 12:11:20 +03:00
josteph
13b00364e3 units: Add a po comment in Elvish High Lord.
(cherry picked from commit 1f0c466a3d806a89ce8069b464e357797799f06e)

(cherry-picked from commit 9072934d45a2db49053d511c2d8c5db8b707f34d)
2018-10-07 03:25:03 +00:00
Severin Glöckner
c48735c0fb Core Macro Reference: Fix hint
[ci skip]

(cherry-picked from commit 00e41b9857e8dfdb5f603fe7d91a1a6e0725b8c7)
2018-10-07 03:25:00 +00:00
Severin Glöckner
5ad321654b core macros: don't clear nonexistant variable
A leftover from the switch from {FOREACH} to [foreach]

[ci skip]

(cherry-picked from commit 001b444b10977051962572a991233553bd605384)
2018-10-07 03:24:59 +00:00
mattsc
800947594c Experimental AI: convert to using external CAs
(cherry-picked from commit 547478571871ffe59c5cf7ff59339a72a61c07dc)
2018-10-07 03:24:44 +00:00