72786 Commits

Author SHA1 Message Date
gfgtdf
b6cce36c34 Revert "preserve traslatable strings in simple_wml."
This reverts commit 4f3ce6865cdd628634fc3ffe2154093d6ccbfba4.
This reverts commit 20128ac9914c971d759399dff6f7ed8edcb960c8.

see issue #3454, there were problems caused by simple_wml when
joining/observing games and this commit is the obvious suspect
so i'm reverting it until we can fix that one.

(cherry-picked from commit 6b58ce7c04d7f369f8fc5dd5cba0b58def2c2697)
2018-10-07 03:24:22 +00:00
gfgtdf
3c8143539e fixup 'fix game freezes on droiding when using dsu #3453'
fixes https://github.com/wesnoth/wesnoth/issues/3486

(cherry-picked from commit 08bb6a4e9600bfe1aa533d684cc5fa1f8a9ed0f4)
2018-10-07 03:24:21 +00:00
gfgtdf
9cc105f018 show add-on loading times on --log-debug=config
(cherry-picked from commit 6781fe17ca40e1f8af5f117c7e3645b3ab6f599c)
2018-10-07 03:24:21 +00:00
gfgtdf
a0eaf4e7a4 fix editor cannot add starting location for > 9 players.
previously attempting to place a starting location for side 10 or higher would result in a "invalid location id" error.

(cherry-picked from commit cbf078a030305ac523ecd7472d3c7f32d566d20b)
2018-10-07 03:24:21 +00:00
Wedge009
6f66e0d52f Slightly rewrite dialogue (fixes #3386)
Some non-native English readers may find use of the word 'disposed' confusing.

(cherry-picked from commit 087a18a156096c8a7b9fb56359aca579a222011d)
2018-10-07 03:24:21 +00:00
Nobun
90956117ab wmlxgettext: fix #3469: lua plural strings not recognized in some context (#3481)
* bugfix: https://github.com/wesnoth/wesnoth/issues/3469

* wmlxgettext: removed a debug comment forgotten on the previous bugfix

(cherry-picked from commit 4b79c263d357fb23e4531ad8fbd37b2bfbc85c55)
2018-10-07 03:24:20 +00:00
Iris Morelle
79fd02cd0f pofix: Genericize the Lua version number for the 1.14 announcement
Otherwise people will keep complaining that it doesn't reflect the
latest 1.14 version since the original number was valid for 1.14.0 and
1.14.4.

[ci skip]

(cherry-picked from commit c589e39098614b2180b4043db6b9faa71afe6c84)
2018-10-07 03:24:20 +00:00
Severin Glöckner
bd88e4d153 Capitalize Pango
[ci skip]

(cherry-picked from commit 12369a2fa490b87bdf44a0cee34065a03a22e8e8)
2018-10-07 03:24:20 +00:00
Severin Glöckner
bb680ba5f4 clarify that pango markup is the cause
changed as proposed by soliton

(cherry-picked from commit 6998885cc1d2f063c02f803b1f4f7644804e9626)
2018-10-07 03:24:20 +00:00
Severin Glöckner
1efaa64a1b Linux Packaging: Don't store log info which nobody will read
So it may not be saved in ~/.xession-errors
or cluttering up disk space another way

(cherry-picked from commit c998f13a4526d89840b3bf7e36e6a4ffd57d7c80)
2018-10-07 03:24:19 +00:00
sigurdfdragon
fe545d4624 SotA S14: Add hint about needing plenty of gold for the next scenario
(cherry-picked from commit 7aced8754818adf6e3151caa3663ca96dc346175)
2018-10-07 03:24:19 +00:00
Martin Hrubý (hrubymar10)
e4da9d9af4 Use MacCompileStuff for every macOS package
(cherry-picked from commit 6f8c5041210eba5daa59ca0e52dda5822c3ca005)
2018-10-07 03:24:19 +00:00
joeylmaalouf
9fb1ee2308 Make Dune Burner line naphtha icons consistent and remove outdated comment
(cherry-picked from commit df8a6f555723bc2f621e3325e7541e4266ca49d3)
2018-10-07 03:24:19 +00:00
joeylmaalouf
027d50f06b NR S14: Update epilogue map to match previous scenario (fixes #3385)
(cherry-picked from commit 3d47ed8ab4570cbf0135ff8cf45f41107b5b8241)
2018-10-07 03:24:18 +00:00
josteph
6ac3ffd913 Fix crash after hitting enter when no units match the recall list filter
Fixes #3475

(cherry-picked from commit a3047f37d3c2d225dfa403eda5220858be221cc2)
2018-10-07 03:24:18 +00:00
Iris Morelle
635e17e03a Revert unwanted binary file change in previous commit
[ci skip]

(cherry-picked from commit d3650a78142e2f3cb9e29153c376c211b8776f61)
2018-10-07 03:24:18 +00:00
Iris Morelle
0c0192c58d gui2/game_load: Constrain leader sprites to 72x72 using image path functions
Fixes #3474.

(cherry-picked from commit 36cf8c8d70198c6090119398f2b52cd542feceb7)
2018-10-07 03:24:17 +00:00
Konrad2
f434c0c427 Made Thursagens words fit the timeframe
(cherry-picked from commit cf999f7365f3ba14bf724d34c32cc154d3918b26)
2018-10-07 03:24:17 +00:00
Martin Hrubý
96bbebb514 Fix building with Xcode 10 (#3460)
Resolves #3458.

(cherry-picked from commit 50301f84e33d828c39835bc47f04dd1107631960)
2018-10-07 03:24:17 +00:00
sigurdfdragon
6eaba32413 Fixup ed50b6b
[ci skip]

(cherry-picked from commit 638fd4bda09fb355335f9d3d40c21d8c42a338ba)
2018-10-07 03:24:16 +00:00
mattsc
af608e686a Update changelog
(cherry-picked from commit c59a084f11f418e113cced9833439aca59d5dc39)
2018-10-07 03:24:16 +00:00
mattsc
35df7f6ba0 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.

(cherry-picked from commit d4213371b1cc1ae1b7575e082b7edc69f6236db0)
2018-10-07 03:24:16 +00:00
sigurdfdragon
7027930cf1 Units: Have Saurian warriors be female to fit lore in mainline
Fixes #3392 & goes along with #3372.

(cherry-picked from commit ce6826d80ecd174fe4609f9df571ffac02a6c8d7)
2018-10-07 03:24:16 +00:00
sigurdfdragon
7aa185e530 Help: Add Saurian race description (fix #3372)
[ci skip]

(cherry-picked from commit ed50b6bec4d47e76e048c0eb05ad24a1818cc60b)
2018-10-07 03:24:15 +00:00
Nils Kneuper
d9bac74c55 updated British English translation
(cherry-picked from commit 2f313455b86a709f104cebdbeab610fc1eb8363c)
2018-10-07 03:24:15 +00:00
newfrenchy83
341ad0821d Update wesnoth.cbp
(cherry-picked from commit ae1149948650c9bb663b00407766a563aee13beb)
2018-10-07 03:24:15 +00:00
Pentarctagon
10638b42ff Fixes track titles not being set from WML.
The current implementation of the [music] tag sets the title after adding the track, however the title field was read only.  This makes the field writable.

(cherry-picked from commit 0f5899b16301a22efaeab3bdc8f97c808596429f)
2018-10-07 03:24:14 +00:00
gfgtdf
3c86e3bc8f fixup [terrain_mask]
(cherry-picked from commit 7d44782e5c027c3aee6b0b0bf89cac3f874cd672)
2018-10-07 03:24:14 +00:00
gfgtdf
42af4c3378 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].

(cherry-picked from commit 09c56ef2fe40eaec53311918288431256aac63ff)
2018-10-07 03:24:14 +00:00
gfgtdf
e4c170f249 fix villages after terrain_mask
(cherry-picked from commit 6cd9de1202d1f4f90d56ba9b7950aecfc1e5f3f4)
2018-10-07 03:24:14 +00:00
gfgtdf
6a10e12a6a add wesnoth.terrain_mask lua function
`[terrain_mask]` had multiple unexpected behviours, see for example #3364
in parituclar `wesnoth.wml_actions.terrain_mask { x =2, y=2, mask="Ww"}`
will change the tile at (1,2) instead of (2,2), so instead of reusing
the old terrain mask code i wrote a new function that behaves as one
would expect. `wesnoth.terrain_mask` does not have a `border=` parameter
but a `is_odd` parameter that specifies that a map is in the odd format
 __    __
/00\__/20\__
\__/10\__/30\
/01\__/21\__/
\__/11\__/31\
/02\__/22\__/
\__/  \__/

instead of the even map format
    __    __
 __/10\__/30\
/00\__/20\__/
\__/11\__/31\
/01\__/21\__/
\__/12\__/32\
   \__/  \__/

(Monospaced font required to see ascii images.)

The lua function also has a lua interfacte, meaning it does not take wml
tables but normal lua tables making it easier to use from lua code.

(cherry-picked from commit a3367ee8489608a6fff42a69fb026933571848b7)
2018-10-07 03:24:13 +00:00
gfgtdf
a1ee3fb26e deploy string_view
(cherry-picked from commit 8d6524c6e21a4c5bfc99963fe0b95b9f8956f8ce)
2018-10-07 03:24:13 +00:00
gfgtdf
35e34c7331 add debug info
(cherry-picked from commit 9bb601e2da02b3b627b6673897c67c9c6f67a950)
2018-10-07 03:24:13 +00:00
gfgtdf
8fbe9cb743 remove outdated code
substr cannot throw bad_lexical_cast

(cherry-picked from commit e90f0fce13e74b53dbac92d7a588909948f6a93f)
2018-10-07 03:24:13 +00:00
gfgtdf
1dff5db604 fix game freezes on droiding when using dsu #3453
(cherry-picked from commit 1646a7b90672435551436c1fe272f5546f151ffb)
2018-10-07 03:24:12 +00:00
gfgtdf
6b4e74e825 boost::ptr_vector -> std::vector<unique_ptr>
boost::ptr_vector has some nice features, but vector<unique_ptr> is still
easier to use for most people basicially becasue people know it better.
Also boost::ptr_vector does not support move ctors and also does not
use std::unique_ptr, probably because it tries to stay compatible with
c++03 so one has to use 'ptr_vector::auto_type' with it instead which
has a different interface than std::unique_ptr

(cherry-picked from commit 7e2dc296ba2fd3900a46ab3a0bbb120e856e0ada)
2018-10-07 03:24:12 +00:00
gfgtdf
3e7c530c05 fix 'start game' locked when other players abort flg dialog #3452
(cherry-picked from commit f03e3e8d6df84163f403d5860be7638084bd1481)
2018-10-07 03:24:12 +00:00
gfgtdf
8f4c8540c3 improve wesnoth version warning 3
suggested by soliton

(cherry-picked from commit bd16aeec02ceeeca42b281cfe2bf46a5f3791bca)
2018-10-07 03:24:11 +00:00
gfgtdf
f517f3af74 fix missing map previews in the lobby
regression from 'fix require_scenario & require_era'

(cherry-picked from commit 9a3917dc3518455b0b8fa03f95ea71217a23550c)
2018-10-07 03:24:11 +00:00
gfgtdf
932edd30c5 fix segfault in wesnothd
broken in commit 'preserve traslatable strings in simple_wml.'

(cherry-picked from commit 7e0d63d7c32b4c280baa63cb60dc32c565ea0eae)
2018-10-07 03:24:11 +00:00
gfgtdf
920b34a208 fix oos when undoing after ally chat 2
for extra safety we add code to ensure undo=no for [speak] commands to the client aswell, this is not really needed as i just added a code that sets undo=yes to the server code, but it's an advantage to be able to safely connect to older servers aswell.

(cherry-picked from commit c685031d1c41d89897bbd380b50ef3e02984bcde)
2018-10-07 03:24:11 +00:00
gfgtdf
96eb02aecc fix oos when undoing after ally chat
previously the server would send [speak] commands that had no undo=no attributes so that the game would remove the speak command from the replay instead of the actual undoable action when undoing an action.

(cherry-picked from commit 02bed5c0335893542f5f3732ea013ab1ca705c55)
2018-10-07 03:24:10 +00:00
gfgtdf
4c1f00e386 fix game crashing on 'reset replay'
fixes #3439

(cherry-picked from commit 7bf37a1e64388304d583cdaa1fbba97fd61f9658)
2018-10-07 03:24:10 +00:00
Elvish_Hunter
338d190563 wmllint: added [lua] to the allowed children of [if]
(cherry-picked from commit b1ec52cab84a5a18bd1518449fec374f4be3492b)
2018-10-07 03:24:10 +00:00
Elvish_Hunter
236ca25832 wmllint: don't even try to convert _info.cfg
(cherry-picked from commit 6e696661fdc8710a4310d3a2fd7228e3f135e5ed)
2018-10-07 03:24:10 +00:00
Elvish_Hunter
46f9d93c4c wmllint: do not warn about unknown IDs in [tunnel], except inside of [filter]
(cherry-picked from commit 2d045f2a6a47c58b5bb1d77d3c836119e5978708)
2018-10-07 03:24:09 +00:00
Elvish_Hunter
2b0bbd8280 wmllint: do not warn about unknown IDs in [remove_event]
(cherry-picked from commit 2dda3280c1b3098aba146e2775e58577930d3e60)
2018-10-07 03:24:09 +00:00
Elvish_Hunter
87999f68b4 wmllint: do not warn about unknown IDs in [aspect]
(cherry-picked from commit 9b5c0dda5c819e5ac6a40a78241a36e022a84f75)
2018-10-07 03:24:09 +00:00
Martin Hrubý (hrubymar10)
01d5998866 We no longer support OS X Lion - remove legacy code
(cherry-picked from commit b6507cbbf2d01ae84130e5db2a08796f98f1235c)
2018-10-07 03:24:09 +00:00
Martin Hrubý (hrubymar10)
377c9dd15e Update changelog
(cherry-picked from commit 29c5d25e27253a19e236e6b8a0ba324e014a6cd8)
2018-10-07 03:24:08 +00:00