See https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=450#p625660
All images but the young roc/roc would remain under the GPL, since Kwandulin based them on images by Sleepwalker and I wasn't able to contact him about using the CC BY-SA for them. The young roc base and attack sprites are under the CC BY-SA, and are by Vyncyn(forum username).
This reverts commit fb866c6d13.
This fix is specific to master and translators aren't supposed to be
touching master at this time. There is no point to its existence.
These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").
See issue #2940.
[ci skip]
Fixes a few spellcheck warnings caused by text recently introduced to
NR. These are definitely general lore names and should be known
regardless of the campaign anyway.
Fix four instances — one in The Rise of Wesnoth’s dialog, two in the
ogre race description, and one in the “LAN server” “motd” — of the
straight apostrophe (U+0027 ' APOSTROPHE) being used in player-visible
text, where the typographic apostrophe (U+2019 ’ RIGHT SINGLE QUOTATION
MARK) ought to be used instead.
the khalifate are not stable enough so far to be in 1.10, they need a
lot more playtesting, rebalancing as well as adding d escriptions
because of this they can't be allowed in at the time of the string and
feature freeze since adjustments would basically be impossible then
"someone" will have to move the khalifate into an addon so that
development of them can be continued this way
this commit includes:
* removal of unit definition files
* removal of unit images
* removal of faction definition
* removal of era definition (khalifate+default era)
* removal of movement types
what was not removed:
* definition of the unit names
what someone else has to edit:
* khalifate still appear in tools/emacs_mode/wesnoth-wml-data.el but I
have no idea how to handle that file...
TODO:
* add the removal to the (players_)changelog and the release notes
All forest now aliased to base,forest (and snow if appropriate)
Best defense, worst movement
mounted move_type has forest defense capped at 30%
-> maintains old behaviour for mounted units over flat terrain
-> mounted units now have 30% defense on forested hills
-> naga myrmidons now have 50% defines on flat forest
-> all other units/terrains appear unaffected
fixes bug #18216