72007 Commits

Author SHA1 Message Date
Charles Dang
f536852a54 Fixup a1810bde32a95 (better comment)
[ci skip]

(cherry-picked from commit 4b6e5478be3293794e030d7f63071a13fecbb0b1)
2018-10-07 03:19:01 +00:00
Charles Dang
ed3620869f UtBS: removed old Desert Elves and accompanying scenarios and loading code
[ci skip]

Also fixed the campaign icon to use the new Kaleh sprite instead of the old one.

(cherry-picked from commit 1068ca128c0e50f09cfc77effafde98aa678b251)
2018-10-07 03:19:01 +00:00
Celtic Minstrel
257f71340e Fix gender-dependent strings in SotA involving the kids
(cherry-picked from commit 7661c655b07f739738ef791719b80b8af1c69880)
2018-10-07 03:19:01 +00:00
Celtic Minstrel
47bffc18e2 Fix #2848
(cherry-picked from commit 04d51a4b17b9eabb59c077b235e9c952b8890540)
2018-10-07 03:19:01 +00:00
Celtic Minstrel
6ddfd84093 Fix #2857
(cherry-picked from commit b46381c83a290b081cc700c13fc182c88301bebd)
2018-10-07 03:19:00 +00:00
Charles Dang
0fbb01e219 Game Events/Manager: skip disabled assertion if write_events is called mid-event
This reverts afaa75842c8914406bed75d3557ec241b0de9b6a and replaces it with a more general
no-assert-during-events check. This is because there are other instances besides [inspect]
where this function can be called mid-event, and it wouldn't be convenient to add nested
'strict' parameters to multiple functions just to handle them.

Fixes #2750.

(cherry-picked from commit a1810bde32a95ae00827b5db5ac08f63d9907acb)
2018-10-07 03:19:00 +00:00
Charles Dang
81494ce3ee Changelog entry for 79072b7c3d7ab662f1ca7bb27aa257bf9fd1a9fe
[ci skip]

(cherry-picked from commit b0f767bdb5056ed2f12c26b5c52157abcf6908b4)
2018-10-07 03:19:00 +00:00
Charles Dang
693d5f3687 Gettext: used [[maybe_unused]] for UNUSEDNOWARN on C++17
(cherry-picked from commit 275057df59ae52214761d73bc32bbb96a7595f10)
2018-10-07 03:19:00 +00:00
Charles Dang
5462bc5d17 MP Create Game: fixed campaign player numbers label being untranslatable
Fixes #2861.

Also changed the logic for when the "min to max" label is shown from != to >.

(cherry-picked from commit a4dd74c32afb2f6c37453eafb60f60b8b215df01)
2018-10-07 03:18:59 +00:00
Jyrki Vesterinen
47794122e8 Changelog entry for commit c42401a8deb92acc16039fbeed0acf16287e286c
(cherry-picked from commit c23fc2b66645fe82d290de09a36f6e625747ed69)
2018-10-07 03:18:59 +00:00
Jyrki Vesterinen
a01cde437a Fix #1736: on GNU/Linux, a hotkey can trigger multiple commands
SDL_TEXTINPUT events aren't generated on Windows when Alt is held down.
Let's ensure that the behavior is the same on all platforms.

(cherry-picked from commit c42401a8deb92acc16039fbeed0acf16287e286c)
2018-10-07 03:18:59 +00:00
Jyrki Vesterinen
9bcb4bbf35 Convert README for manual images to Markdown
I also updated the filenames for the images, changed the recommended
format for screenshots other than "fullscreen" screenshots to PNG,
and removed the (no longer true) claim that the example places to create
the screenshots match where the English screenshots were taken.

Resolves #2856.

[ci skip]

(cherry-picked from commit 134a51204b730ff2123e2af5b19f1fae58aa0515)
2018-10-07 03:18:59 +00:00
Nils Kneuper
ff283e85d0 updated Chinese (Simplified) translation
(cherry-picked from commit fd4f36e3c93ea91fb020cff998f6bf7df97eee9d)
2018-10-07 03:18:58 +00:00
Sofartin
46dea87342 Add new packager
(cherry-picked from commit 769f102f2ec0438eec714cc2d541b5d46ac3113e)
2018-10-07 03:18:58 +00:00
Celtic Minstrel
af7adf2df6 Update changelog
[ci skip]

(cherry-picked from commit 81b4ef1d7c65615aa069edc84697167329911a51)
2018-10-07 03:18:58 +00:00
Celtic Minstrel
4f2f292618 Add u and v variables to pixel_callable
It's currently calculated from x,y and w,h, but with the switch to shaders
this situation could be reversed to calculate x,y from u,v and w,h

(cherry-picked from commit 46c46b5548e1c02179a32b43f5d77696cbb68a9c)
2018-10-07 03:18:57 +00:00
Charles Dang
b6991ced4d MP Staging: made the faction select button about as prominent as you can get
[ci skip]

Thanks to grzywacz for pointing out the possible use of the unit icon.

(cherry-picked from commit dba3d409fcf64b356f34ad82a32fa762cc5dfb8c)
2018-10-07 03:18:57 +00:00
Charles Dang
224da8cfc7 Changelog entry for recent SotA fixes
[ci skip]

(cherry-picked from commit 7942b53ee8e3848f500e336bbbc74a1dacb520e6)
2018-10-07 03:18:57 +00:00
Charles Dang
cbcd728ad2 SotA S8: fixed inconsistent Ghost name (fixes #2846)
[ci skip]

The dashed version is used in prior scenarios.

(cherry-picked from commit 57c797d516bc909af36bced83b6a2bc2b90c0e42)
2018-10-07 03:18:56 +00:00
Charles Dang
b25f813d94 SotA S7: fixed inconsistent town name (fixes #2845)
[ci skip]

The two r's version is used in two other locations.

(cherry-picked from commit 565c4dbf60b38908025bae78d9a84002de6968f2)
2018-10-07 03:18:56 +00:00
Charles Dang
72d3f15dc6 MP Staging: make Faction Select button's purpose more clear
[ci skip]

(cherry-picked from commit 1f0588883cdb9158caff7f9bbceda01e0774f27f)
2018-10-07 03:18:56 +00:00
Charles Dang
1bd22008f0 SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)
[ci skip]

(cherry-picked from commit 77863cc52685dd33e1587a2e9e437f21d8f1574f)
2018-10-07 03:18:56 +00:00
Charles Dang
dc46369288 SotA S2: fixed units with translatable IDs........
[ci skip[

(cherry-picked from commit 48010f514e32deac20e286174c487d2aa13134ad)
2018-10-07 03:18:55 +00:00
Charles Dang
6ae7c8e6c2 Unit Create: fixed unit selection not persisting between uses (fixes #2822)
I had been unconditionally selecting the first entry after setting the active
sorting option. This overrode the previous unit selection.

Regression from 6b52d16faedaf6499f4777ed8156b1eaa09ab554.

(cherry-picked from commit ccce10511a2e74e23448e54e652874711bf6bad8)
2018-10-07 03:18:55 +00:00
Celtic Minstrel
65092a4cfb Update changelog
(cherry-picked from commit 8581637b5146152fdd14af9ac4372a63995195e7)
2018-10-07 03:18:55 +00:00
Celtic Minstrel
139d80ecb3 Support alignment= in SUF
(cherry-picked from commit 4b2dd68595a55b5fea68a26f28a464b312a82cf4)
2018-10-07 03:18:55 +00:00
Celtic Minstrel
0d1ee9aa63 Support usage= in SUF
(cherry-picked from commit 62d39d653230f98100a5de5aac9e8c7be2b7e7ea)
2018-10-07 03:18:54 +00:00
Celtic Minstrel
8d3fd89800 SWF: Support lists for special= and special_active=
(cherry-picked from commit 46f4b514822aadfed173f705ec401439b6aae74d)
2018-10-07 03:18:54 +00:00
Celtic Minstrel
6a698064d6 Deprecate [replace_map]map= in favour of [replace_map]map_data=
This gives greater consistency between similar APIs, and allows macros
intended to drop a map into [scenario] to also work in [replace_map].

(cherry-picked from commit c62a4820fcab36e3c556f698d60e1afa9d242f84)
2018-10-07 03:18:54 +00:00
loonycyborg
75a9a51166 nsi script: update expected extensions of changelogs
(cherry-picked from commit 0e5463fd818b8cce388142c3ea949a289f6340ef)
2018-10-07 03:18:54 +00:00
Jyrki Vesterinen
92f8e24796 Fix linking of C++ unit tests with CMake
The problem with them is that the "libraries" into which Wesnoth is split
have circular dependencies, and linking of the game succeeds only by chance
(everything just happens to be used by the time the linker encounters it).

Fixed by allowing the linker to use multiple passes over the libraries
until all references are resolved.

(cherry-picked from commit e7ed3cbbb9ad474f2f89137fceece946eaa95e81)
2018-10-07 03:18:53 +00:00
newfrenchy83
e81512ba83 Update wesnoth.cbp
(cherry-picked from commit 2c65dff722f16d4c0a0892941c05062ccff59966)
2018-10-07 03:18:53 +00:00
Sofartin
eac9fe785c Add l10n-track to macOS Package - #2825
(cherry-picked from commit d27e359d6eafe840d7c8fb3f75483a6b9ab29f3b)
2018-10-07 03:18:53 +00:00
Charles Dang
c37baf10a4 Image: handle case where l10n-track file is not present
Resolves #2825.

(cherry-picked from commit d786fd6622c64660c88ced38c1a442eb9a7389c7)
2018-10-07 03:18:53 +00:00
Nils Kneuper
a4ece0ce2d updated French translation
(cherry-picked from commit 6be41f51a5ef4714749b05577509cd3ebab24cdb)
2018-10-07 03:18:52 +00:00
stevecotton
e39a71fd22 LoW S09 Lua cleanup: fix a line that was missed in 3783693cb (#2835)
3783693cbe95be6c51553dfa71bf0ecd5ed8116f was a general rename of
'V' to 'vars', and this line was missed. It caused an error at the
start of S09.

[ci skip]

(cherry-picked from commit 2b406a37ec009e4a13251035267356b4d82ab1f1)
2018-10-07 03:18:52 +00:00
Sofartin
f806b194ae Bump wesnoth version
(cherry-picked from commit 83c0fc5073fea7b2f5dbed0351baf9f248dd31e8)
2018-10-07 03:18:52 +00:00
Iris Morelle
99d2919f5d gui2/log_settings: Make log options tooltips translatable
Fixes #2837.

(cherry-picked from commit 3967fd190e60b59cb9017bf4013a177dfcb44fdd)
2018-10-07 03:18:52 +00:00
loonycyborg
bb7afe25bb flatpak-builder manifest: cleanup a buildtime only dependency
(cherry-picked from commit c955416ef2d5ece6a15a473320b974391dfe878f)
2018-10-07 03:18:51 +00:00
Charles Dang
a2c5129dda Renamed two t-prefix typedefs
[ci skip]

(cherry-picked from commit e7a8af0c40578aa29ccefe6c45a15c5057188162)
2018-10-07 03:18:51 +00:00
Celtic Minstrel
101188cc61 Remove ai.synced_command stub
(cherry-picked from commit 2afb40e3e95e63fb4399fad857de1f1e053a8bb5)
2018-10-07 03:18:51 +00:00
Sofartin
8cfae7ffd0 Remove libpng headers
(cherry-picked from commit 756f24d85e3752c6ff5f629a485c6089629e24bf)
2018-10-07 03:18:51 +00:00
Martin Hrubý
b41d523461 Fixed typo
(cherry-picked from commit 31192cb44bb94efb437eaa15c97af8f4965ad338)
2018-10-07 03:18:50 +00:00
Sofartin
8b5b9ff45a Update Xcode project after 3922a48c5cd694995c76148cfaadc12ca5a20e0b
(cherry-picked from commit 0d4bd9f9084cad320e84283d32602b9dfc92e973)
2018-10-07 03:18:50 +00:00
gfgtdf
59cc2448dc fix [message] side_for= not working for the last side.
fixes #2776

(cherry-picked from commit 0f756b81899ed9e965eb4f40b67bfeaaa3a1e518)
2018-10-07 03:18:50 +00:00
Nils Kneuper
687d81850a updated Polish translation
(cherry-picked from commit b45b0a3cbd99eb6558e0462f14f7cc8be111e264)
2018-10-07 03:18:50 +00:00
Charles Dang
dfce371287 Convert custom unicode type aliases to proper types (available as of C++11)
This changes:
utf8::char_t   ->  char
utf8::string   ->  std::string
utf16::char_t  ->  char16_t
utf16::string  ->  std::u16string
ucs4::char_t   ->  char32_t
ucs4::string   ->  std::u32string

utf16::string and ucs4::string are now proper strings instead of vectors of characters too.

In order to get this change to compile at all, I needed to add a ucs4_convert_impl::convert_impl
specialization for wchar_t alongside the new char16_t specialization; both point to the same
conversion implementation type.

This commit doesn't do any additional cleanup. I'm sure if we looked, we could get rid of a
lot of the custom conversion code and probably a bunch of stuff that might have had to do with
supporting utf16::string and ucs4::string being vectors instead of basic_string specializations.
Either way, I don't know the code (or encoding handling in general) to make a call as to what's
needed or not. I'll let someone else do that.

(cherry-picked from commit 1deacd89f640e1ddada75e1286c14a09ab8cce62)
2018-10-07 03:18:49 +00:00
Charles Dang
553cacd88e Moved game version stuff from game_config.hpp to version.hpp
They're still in the game_config namespace but are now in a more logical header.

game_config::version has been replaced with wesnoth_version.str(), save for one case
where it was replaced with wesnoth_version directly (it was a comparison against another
version_info object; no need to compare against a string...).

Also cleaned up a bunch of game_config.hpp includes.

(cherry-picked from commit b8d051cb72e51682d0fc41a3a37442ed7ecb553d)
2018-10-07 03:18:49 +00:00
Charles Dang
0a409c391f Fixed images with no alpha channel rendering incorrectly
See https://forums.wesnoth.org/viewtopic.php?p=625159#p625159

Since this problem can also be solved with make_neutral_surface, and is_neutral already
check a surface's alpha mask, I moved the is-not-indexed check to is_neutral and made use
of it for the on-load standardization check.

(cherry-picked from commit 6babb773d2319625a5b7def241fc0f9e4921db42)
2018-10-07 03:18:49 +00:00
Charles Dang
202e3141d3 Changelog entry for c4cf0c9
[ci skip]

(cherry-picked from commit f4fb2a6dcc22e6890b08b1256e140d6f9a2a880a)
2018-10-07 03:18:48 +00:00