Commit graph

420 commits

Author SHA1 Message Date
Charles Dang
32da54b059 Removed Boost Thread as a built-time dependency
We use std::thread now.

(cherry-picked from commit 9de7aff904)
2018-10-07 03:19:10 +00:00
Charles Dang
1dd00c3441 Game Load: added a convenient button in Load Game to open your saves folder
(cherry-picked from commit 802bbe8cdc)
2018-10-07 03:19:09 +00:00
Jyrki Vesterinen
cb3ddc368b Hotkey manager: drop duplicate commands
We use both SDL_KEYDOWN and SDL_TEXTINPUT events for hotkeys. It's possible
for both events (caused by the same keypress) to trigger the hotkey command
and we don't want that. Hence, let's drop duplicate commands.

Fixes #1736.

(cherry-picked from commit 8667e5bbdd)
2018-10-07 03:19:08 +00:00
Iris Morelle
368e5cb7a7 Update changelog
[ci skip]

(cherry-picked from commit cfd5d5289d)
2018-10-07 03:19:07 +00:00
Celtic Minstrel
9c626fc4f7 Update changelog.md
(cherry-picked from commit 191c23c194)
2018-10-07 03:19:07 +00:00
Celtic Minstrel
c5b5bdda70 Allow [move_unit]dir= to perform relative movements
(cherry-picked from commit 68b33cf6bd)
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 eaf186e021)
2018-10-07 03:19:05 +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 7f8cb13bd3)
2018-10-07 03:19:04 +00:00
Nils Kneuper
9eb6950ed5 updated Galician translation
(cherry-picked from commit 7ab1da24a5)
2018-10-07 03:19:03 +00:00
Jyrki Vesterinen
28b5912043 Revert "Changelog entry for commit c42401a8deb92acc16039fbeed0acf16287e286c"
This reverts commit c23fc2b666.

(cherry-picked from commit 2562a7e3b0)
2018-10-07 03:19:02 +00:00
Charles Dang
0fbb01e219 Game Events/Manager: skip disabled assertion if write_events is called mid-event
This reverts afaa75842c 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 a1810bde32)
2018-10-07 03:19:00 +00:00
Charles Dang
81494ce3ee Changelog entry for 79072b7c3d
[ci skip]

(cherry-picked from commit b0f767bdb5)
2018-10-07 03:19:00 +00:00
Jyrki Vesterinen
47794122e8 Changelog entry for commit c42401a8de
(cherry-picked from commit c23fc2b666)
2018-10-07 03:18:59 +00:00
Celtic Minstrel
af7adf2df6 Update changelog
[ci skip]

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

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

(cherry-picked from commit 1f0588883c)
2018-10-07 03:18:56 +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 6b52d16fae.

(cherry-picked from commit ccce10511a)
2018-10-07 03:18:55 +00:00
Celtic Minstrel
65092a4cfb Update changelog
(cherry-picked from commit 8581637b51)
2018-10-07 03:18:55 +00:00
Iris Morelle
99d2919f5d gui2/log_settings: Make log options tooltips translatable
Fixes #2837.

(cherry-picked from commit 3967fd190e)
2018-10-07 03:18:52 +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 6babb773d2)
2018-10-07 03:18:49 +00:00
Charles Dang
202e3141d3 Changelog entry for c4cf0c9
[ci skip]

(cherry-picked from commit f4fb2a6dcc)
2018-10-07 03:18:48 +00:00
Charles Dang
d52737b5d0 Swapped the position and formatting of game names and titles in the MP lobby
Addresses point 2 of #2815.

(cherry-picked from commit 6615aa7efe)
2018-10-07 03:18:47 +00:00
Steve Cotton
e851bf877a THoT S12 Fix some "x=" tests that should be "x,y=" tests
Taking the chest south of the start hid the door and chest that are
north of the start.

The sneak-door opened much earlier in the level, allowing the undead
from the south-east lich to go north to the spider room.  The ghosts
and nightstalkers that are supposed to ambush the player's forces in
the south (after opening the 3-hex door) instead go north and end up
joining the spider fight.  The slower-moving undead also go north,
and are easily fought one-by-one in the sneak passage instead of the
south-east.

[ci skip]

(cherry-picked from commit 2caed06cdb)
2018-10-07 03:18:46 +00:00
Nils Kneuper
b4736dcc52 updated Polish translation
(cherry-picked from commit 65f690d905)
2018-10-07 03:18:45 +00:00
Celtic Minstrel
5e4b5a56b2 Support location_id in [teleport]
(cherry-picked from commit fed46ec45f)
2018-10-07 03:18:45 +00:00
Steve Cotton
53780f5165 THoT S12 Put the sneak-passageway's door on the right hex (fixes #2804)
This matches with the "Another old caved-in passageway..." event
around line 835, the trigger is on 55,33 and the walls that open are

        [terrain]
            x=55,55
            y=34,35
            terrain=Uu
        [/terrain]

Debian bug #483893, for which the original fix in
4c473187e6 changed the wrong digit.

This is a cherry-pick from 1.14 to master (fixes #2804) of
bcaac1ef (the change) and 5b7aca97 (the changelog).

[ci skip]

(cherry-picked from commit d6661fdb80)
2018-10-07 03:18:44 +00:00
Nils Kneuper
f7b66ca40e updated Czech translation
(cherry-picked from commit 742c378361)
2018-10-07 03:18:43 +00:00
Nils Kneuper
7257d555f2 updated French translation
(cherry-picked from commit a32d689c46)
2018-10-07 03:18:41 +00:00
Celtic Minstrel
5a30e97c91 Update changelog
(cherry-picked from commit 8becc799c1)
2018-10-07 03:18:40 +00:00
Nils Kneuper
79e6e578d2 updated British English translation
(cherry-picked from commit 57c1a67134)
2018-10-07 03:18:36 +00:00
Nils Kneuper
b02b6d0853 updated Ukrainian translation
(cherry-picked from commit 4bcfada88a)
2018-10-07 03:18:36 +00:00
Nils Kneuper
b2d715a4da updated Scottish Gaelic translation
(cherry-picked from commit f19db187fa)
2018-10-07 03:18:35 +00:00
Iris Morelle
97fbeb6c7d UtBS: Hide technical terrains in the Help browser
[ci skip]

(cherry-picked from commit 9808a6a722)
2018-10-07 03:18:33 +00:00
Iris Morelle
c38811f310 Update changelog
[ci skip]

(cherry-picked from commit 0cdee6b04c)
2018-10-07 03:18:33 +00:00
Nils Kneuper
4e653eba66 updated Chinese (Simplified) translation
(cherry-picked from commit 40d63a4a25)
2018-10-07 03:18:32 +00:00
Iris Morelle
065501bfbf Sync changelogs across branches
[ci skip]

(cherry-picked from commit 139695d7b1)
2018-10-07 03:18:31 +00:00
Iris Morelle
f1453d7f7a Fix up previous commit to match 1.14
[ci skip]

(cherry-picked from commit ecb80e607e)
2018-10-07 03:18:31 +00:00
Iris Morelle
74ed9d2dca Update changelog for the synced debug command UX changes
[ci skip]

(cherry-picked from commit 66b60f4731)
2018-10-07 03:18:31 +00:00
Iris Morelle
5ae25a8453 Alphabetical order, alphabetical order, alphabetical order...
[ci skip]

(cherry-picked from commit 28c35e71fa)
2018-10-07 03:18:22 +00:00
Iris Morelle
bff5dcee30 Update changelog for issue #2732 and issue #2709
[ci skip]

(cherry-picked from commit 6f17695d7c)
2018-10-07 03:18:22 +00:00
Celtic Minstrel
d72612443f Allow percentages in [random_placement]num_items=
(cherry-picked from commit 229d2f0483)
2018-10-07 03:18:19 +00:00
Celtic Minstrel
0131631220 Allow WFL for [random_placement]num_items=
(cherry-picked from commit e4a2c14177)
2018-10-07 03:18:18 +00:00
newfrenchy83
ebb980a45e Implement [filter_weapon] in leadership and resistance abilities
Closes #2718

(cherry-picked from commit 76c2cbac46)
2018-10-07 03:18:17 +00:00
Celtic Minstrel
02b6987158 Support to_location in [move_unit]
(cherry-picked from commit 1dd411a84e)
2018-10-07 03:18:13 +00:00
Celtic Minstrel
aeb48e82b8 Update changelog
(cherry-picked from commit 7a1ea36d39)
2018-10-07 03:18:13 +00:00
Nils Kneuper
aa1c926065 updated Spanish translation
(cherry-picked from commit 0bab3fb4d3)
2018-10-07 03:18:06 +00:00
Iris Morelle
ecc0e8a36d Update the changelog
[ci skip]

(cherry-picked from commit 9d76278e71)
2018-10-07 03:18:05 +00:00
Charles Dang
43053105f3 Post-release version bump
The stable 1.14 branch has now diverged, and master is back in development mode for
the 1.15 series. Therefor, bumping to 1.15.0-dev here on master.

(cherry-picked from commit 0094a19e85)
2018-10-07 03:17:54 +00:00
Charles Dang
28d35f4d8c Pre-release version bump for the rest of the things 2018-03-18 17:23:40 +11:00
Charles Dang
5c86dc81be Temporarily re-enabled display of all languages, regardless of completeness 2018-03-18 17:19:08 +11:00