71776 Commits

Author SHA1 Message Date
loonycyborg
99da3421ab Fix issue #1757: prevent abnormal termination if failed to bind address
(cherry-picked from commit 19d9e150e15ef811a2a395dbce874086c5efe216)
2018-10-07 03:19:07 +00:00
Iris Morelle
368e5cb7a7 Update changelog
[ci skip]

(cherry-picked from commit cfd5d5289d94aad69b5ef6ed3433e001ef224b49)
2018-10-07 03:19:07 +00:00
Iris Morelle
d7db76308e Add team colouring to some Aethermaw props missing it
[ci skip]

(cherry-picked from commit 8c97458a76b1a7303e23c2008cb069b0ffdd6724)
2018-10-07 03:19:07 +00:00
Celtic Minstrel
9c626fc4f7 Update changelog.md
(cherry-picked from commit 191c23c194bedf13e1eb6e27eb469d43da965af5)
2018-10-07 03:19:07 +00:00
Celtic Minstrel
3735b9c4f2 Add [move_unit]clear_shroud= as an attempt to clear shroud as the unit moves (untested)
(cherry-picked from commit b062b19e10c85faecf65246e94ec8dbbad0ad4ed)
2018-10-07 03:19:06 +00:00
Celtic Minstrel
c5b5bdda70 Allow [move_unit]dir= to perform relative movements
(cherry-picked from commit 68b33cf6bd8a44470c7ba8069b6b3502e117b5bd)
2018-10-07 03:19:06 +00:00
Celtic Minstrel
4ce00c6b6c Allow [move_unit]to_location to take a list of waypoints
(cherry-picked from commit 622db9d08b1e15ba99ccb797b4785ac9df4f49fe)
2018-10-07 03:19:06 +00:00
Charles Dang
9686d2030f TRoW: removed old, now-unused story art
[ci skip]

(cherry-picked from commit 3d71caff38d1261cfa3572e61b1b108c86adc06f)
2018-10-07 03:19:06 +00:00
ln-zookeeper
f46c4e9048 TRoW: New set of story art by LordBob
In scenarios 06 and 14 I turned the opening narrator message into story text instead. The image for 03 isn't used yet as there's no text to accompany it.

(cherry-picked from commit eaf186e021d885d5fb39c0ff5c89413d769f0fdd)
2018-10-07 03:19:05 +00:00
Iris Morelle
de8313a398 Fix test scenario references to Kaleh's WML
This is required after commit cbedd09ec2bd0d121e1deb38e3600f1e042032b7.

(cherry-picked from commit 0610b48d7e150a319ac55bb348d44d569712cc0d)
2018-10-07 03:19:05 +00:00
Celtic Minstrel
cdef87e875 Fix #2745
(cherry-picked from commit 8f6613ea09ba5740c9b9d4d50d4ebb1215605f82)
2018-10-07 03:19:05 +00:00
Celtic Minstrel
402b6d4cec Fix #2875
(cherry-picked from commit bf70d50b80857b01b70357bf8e6d62b55c34b6ec)
2018-10-07 03:19:04 +00:00
Iris Morelle
5eac05ac4c help: Use new attack stats separator in unit descriptions
Closes #2873.

(This is part of a commented-out block in master because Vultraz hasn't
updated the code yet. He said I could forward-port the patch into it
anyway. For the time being unit descriptions are just completely missing
because of this.)

(cherry-picked from commit 7f8cb13bd309eabe960a975a0ec0b5cbdd7f0719)
2018-10-07 03:19:04 +00:00
Nils Kneuper
bf83fdf649 updated Czech translation
(cherry-picked from commit 90dba93784d525be7007edffc6e3cbb66422157f)
2018-10-07 03:19:04 +00:00
Nils Kneuper
9eb6950ed5 updated Galician translation
(cherry-picked from commit 7ab1da24a52d5842c0c3aaf18220f692ce000295)
2018-10-07 03:19:03 +00:00
Nils Kneuper
97f5969719 updated Chinese (Simplified) translation
(cherry-picked from commit 5f201e17f0095e111c9b0f7174f1b6d0be20c3b6)
2018-10-07 03:19:03 +00:00
Jyrki Vesterinen
16535c3355 Revert "Fix #1736: on GNU/Linux, a hotkey can trigger multiple commands"
This reverts commit c42401a8deb92acc16039fbeed0acf16287e286c.

As @CelticMinstrel pointed out, that commit made it impossible to input characters which require
AltGr to type (e.g. @, € and $ in Finnish keyboard).

Reopens #1736.

(cherry-picked from commit 934f0326d85c90b7b0250f38365f56073540e357)
2018-10-07 03:19:02 +00:00
Jyrki Vesterinen
28b5912043 Revert "Changelog entry for commit c42401a8deb92acc16039fbeed0acf16287e286c"
This reverts commit c23fc2b66645fe82d290de09a36f6e625747ed69.

(cherry-picked from commit 2562a7e3b008a9e349a2f5ce3f215dae62bf9958)
2018-10-07 03:19:02 +00:00
Charles Dang
b20f838933 Fixup 4b6e547 because apparently I cannot write
[ci skip]

(cherry-picked from commit 607bc4c935beaa698d5985eafc5074fbe41bbf37)
2018-10-07 03:19:02 +00:00
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