72437 Commits

Author SHA1 Message Date
Pentarctagon
6be6646a4e Enabled hardened executables by default.
The result of running "hardening-check wesnoth" now shows:
* Position Independent Executable: yes
* Stack protected: yes
* Fortify Source functions: yes (some protected functions found)
* Read-only relocations: yes
* Immediate binding: yes

(cherry-picked from commit 3290961db2eb00221c94f88f02f77ab640f497a4)
2018-10-07 03:22:36 +00:00
Charles Dang
98299d56ef End Credits: reduced text surface size by 42%
[ci skip]

Really no reason for the text area to grow since the text is set in pre_show and
therefor the widget is always the right size. >_<

(cherry-picked from commit 01d37ca7953f3efdd143f7265ecc94dc01791ebb)
2018-10-07 03:22:36 +00:00
Steve Cotton
58d046cacd DW S05: Add a po hint about the orc saying "mermen" (part of #2940) (#3243)
The orc calls them fish-men several times, so changing it to "merfolk"
wouldn't fit.

Also a whitespace fix from wmlindent.

[ci skip]

(cherry-picked from commit ce093e229016f09da90415dd59305c36958b7c18)
2018-10-07 03:22:36 +00:00
ln-zookeeper
c2bba0512f EI S11: Fixed missing prisoners (fixes #3237)
The problem was introduced by commit 0f511e8 due to the [modify_unit] tag apparently causing prisoners to disappear because technically they were duplicates as they had merely been unstored and still existed on the recall list as well.

(cherry-picked from commit c9bb31d1cc9182a4450f29ae529416d2192ab4f9)
2018-10-07 03:22:36 +00:00
Iris Morelle
8ebc39fab2 doc/wesnoth(6): 'none' is a keyword in the --log-<level> description
[ci skip]

(cherry-picked from commit d05de7ced84fc2d8fcb4c3ec3dc8d49d939886ef)
2018-10-07 03:22:35 +00:00
Iris Morelle
90ad7f51ca pofix: Update with 1.14.3 -> 1.14.3a (macOS) rules for the website
[ci skip]

(cherry-picked from commit e636549497feaccc4b9ea3cc5857b148e86a30ee)
2018-10-07 03:22:35 +00:00
Thom Diment
26dd437f81 DW 5 Tirigaz - Changes to orc leader death event (#3103)
DW 5 Tirigaz - Changes to orc leader death event

Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader

(cherry-picked from commit b3c40498d83d4ad3d0701baaee7ca8166546c7e3)
2018-10-07 03:22:35 +00:00
loonycyborg
d474ca9796 Update flatpak manifest
(cherry-picked from commit c78e95cf6c149095b88e18fecd7421e4f0f0a844)
2018-10-07 03:22:35 +00:00
doofus-01
fdd8f5737d UtBS S12: Make alien central body vulnerability more visible to player
(cherry-picked from commit 636575627d6616c47a7678c71fc127d8f8dde841)
2018-10-07 03:22:34 +00:00
doofus-01
1e8163c93f UtBS S11: Citadel graphics, drawn over the cavewall donut
(cherry-picked from commit 79246493191443ccac936b92b6d413a3d28c126e)
2018-10-07 03:22:34 +00:00
Iris Morelle
b524c05e04 pofix: Update with 1.14.2 -> 1.14.3 rules for the website
[ci skip]

(cherry-picked from commit 73680ed764840a2e61d54d859a4768c75b873b3c)
2018-10-07 03:22:34 +00:00
Charles Dang
2b4ae206ab Fixed MP admins being unable to observe private games (fixes #2851)
This was due to the change in the MP initialization process wherein the lobby wouldn't
show up until the initial gamelist was received. Since the admin auth message is sent
after [join_game] and before the initial gamelist, and the chatbox widget handled parsing
the auth message, the client was never marked as authenticated and therefor couldn't
observe private games. This fixes that by adding auth parsing to the MP initialization
process.

Note this doesn't fix the issue of the auth confirmation not showing up in the lobby chat
(issue #2920). I'll have to think of a way to fix that separately.

(cherry-picked from commit e8d55062c4293391ce6a9d70ed24bfa57aaa6490)
2018-10-07 03:22:34 +00:00
Pentarctagon
39785177e2 Fix stack protection with LTO.
(cherry-picked from commit 5a2d1bc992a4527eeee60f8624880a34d84be57c)
2018-10-07 03:22:33 +00:00
Steve Cotton
49d53795a6 Update core/about.cfg to use "merfolk" instead of "mermen" (part of #2940)
(cherry-picked from commit fbc74bf007258436a65926bf3e3edf9f7aa143f3)
2018-10-07 03:22:33 +00:00
Iris Morelle
482b003a16 tools: Add steam-changelog
This is a script to take a changelog section (provided in the command
line as such: `steam-changelog changelog.md X.Y.Z`) and convert it to
BBCode for posting on Steam.

[ci skip]

(cherry-picked from commit a92b83e40466c6ea53d9ad98907abb4d9ce4d4ee)
2018-10-07 03:22:33 +00:00
Charles Dang
2ce506604f Statistics Dialog: keep the same stat selected between scenario selections
Fixes #3223, closes #3226.

(cherry-picked from commit f1d2f85479654a0d5e027bd8afc7ae2d7ddd884f)
2018-10-07 03:22:32 +00:00
Charles Dang
447e946e86 Updated changelog
[ci skip]

(cherry-picked from commit 802443eaf9a7306fda645742855432d14629ee71)
2018-10-07 03:22:32 +00:00
doofus-01
ff4821841a peasant attack animations
(cherry-picked from commit 3f3e13c0b4375a7cf8df8ee6931c0a850b950863)
2018-10-07 03:22:32 +00:00
doofus-01
037f515e41 change ruffian attack anim timings
(cherry-picked from commit c398a8fa8651411c6d0b9742464c063cd0534a86)
2018-10-07 03:22:32 +00:00
Charles Dang
3f9137f7e8 Added an advanced preference for the PRNG combat option
[ci skip]

(cherry-picked from commit 8baeb8457d96e2048ebdac9188bb95fcfbffd340)
2018-10-07 03:22:31 +00:00
Celtic Minstrel
6698a8269a Remove duplicate changelog entries
(cherry-picked from commit 93d4a1237544dc42c8ed15d646b9f70afd8a9a16)
2018-10-07 03:22:31 +00:00
Charles Dang
d002ce2abf Changelog: moved an entry, fixed a typo
[ci skip]

(cherry-picked from commit b27d1c21f5ef59f1694e95d821a04ab6d0993070)
2018-10-07 03:22:31 +00:00
Charles Dang
d1e1214f20 Removed a duplicate changelog entry I missed
[ci skip]

(cherry-picked from commit 92c67f52442f1c334be463409dfda51eb0b70aa6)
2018-10-07 03:22:30 +00:00
Charles Dang
9baabd8b18 Removed duplicate changelog entries under the 1.15.0-dev header
[ci skip]

These were all mentioned between 1.13.13 and 1.14.3, meaning the remaining changes
are everything new in 1.15.0-dev so far. Also removed one entry that was mentioned
twice in the WML Engine section.

(cherry-picked from commit 70a1cdd3e6949a765cead1b31fa6504d44b99b90)
2018-10-07 03:22:30 +00:00
Charles Dang
1e1839de3d Statistics Dialog: merge unit name and count labels
Makes it easier for translators to do something specific with this label if needs
be. I remember the reason the count (NUMx) label was moved prior to the name had
to do with language conventions too, so this should alleviate any other such issues.

Also made the name label default size instead of small.

(cherry-picked from commit 142a2f20ca70deaf4d6a71c918de47aef366fc47)
2018-10-07 03:22:30 +00:00
Charles Dang
1871a32995 Statistics Dialog: remove mode toggle in favor of an All Scenarios menu entry
Closes #2886.

(cherry-picked from commit b5f1e1a48a9d817d1d68a5868903bb3e518cba3d)
2018-10-07 03:22:30 +00:00
Charles Dang
27279f96e1 Added 1.13.13 - 1.14.3 changelog sections
[ci skip]

Duplicate entry cleanup for the 1.15.0-dev section to come

(cherry-picked from commit 556d088e5754ef8197e47c82a828e7fadbc5f93c)
2018-10-07 03:22:29 +00:00
Charles Dang
4e97b511f3 DiD S6: shift the escape location slightly to account for the map redraw
[ci skip]

(cherry-picked from commit 500259a7c2aab1f296441e720ee057e068291a32)
2018-10-07 03:22:29 +00:00
Charles Dang
115c8d1d0c DiD S1/S6: new Parthyn maps
[ci skip]

(cherry-picked from commit b6416b832929a71e6611e1172a0f9e3796f505b5)
2018-10-07 03:22:29 +00:00
Iris Morelle
16b3e3dba1 Move changelog entry around
[ci skip]

(cherry-picked from commit ce8bf3cfc3c9310d97da94d102256e498c9b6f1d)
2018-10-07 03:22:28 +00:00
Charles Dang
201b2973d2 Fixed [scenario] map_file basically being unusable
Automatically checking the path relative to a maps/ directory without binary
path support results in an invalid path almost every single time. If I remember
correctly from my testing, the only time that worked was if I added a data/maps
folder.

(cherry-picked from commit 42349651cb23f372f6919997f3f72ce1a9fc7766)
2018-10-07 03:22:28 +00:00
Iris Morelle
e68bdd1b5f Fix Lua errors when failing to set a music track on an empty playlist
Closes #3194.

(cherry-picked from commit 5871557dbfe407ab454d9f55be6bc2a0fcad0434)
2018-10-07 03:22:28 +00:00
Charles Dang
90cc4569a7 Shuffled a few credits entries around
[ci skip]

(cherry-picked from commit c8fc88454bddbfb03b7da9f9007dcb442cc27485)
2018-10-07 03:22:27 +00:00
gfgtdf
9aef0f923e fix teamchat not marked #3119
(cherry-picked from commit 25840c8a4bdfa1bd7b93069ba9fc2562eca39910)
2018-10-07 03:22:27 +00:00
gfgtdf
758fe79fe2 fix issues caused by empty save id
ee50171d13c7f20a3c8147201c2b78ab54fafae3 broke some codes that relied on
unique save ids, that is in particular the statistic code and
scoped_recall_unit, so now these codes fallback to the side number if
the save id is empty.

(cherry-picked from commit c79e1645c8f04c8a7eaae8dcc1c717f9a6fae7d6)
2018-10-07 03:22:27 +00:00
Jyrki Vesterinen
a5739073ea Remove game_events::wml_event_pump::wml_tracking()
The variable **always** changed when event handlers were run, and thus the
optimizations to avoid updating some status after WML/Lua has run weren't
doing anything. In addition, commit 62ec3b3951bfb7bf6331ad1e98f45ce99e5191d5 removed the most
important optimization that relied on wml_tracking().

Resolves #2578.

(cherry-picked from commit f0896bdf8c9af1f23269e4745a993259b4def060)
2018-10-07 03:22:27 +00:00
Nils Kneuper
5b412030f4 updated Japanese translation
(cherry-picked from commit 92816d42d5ce60c570a74a666f05bc03b7a83acc)
2018-10-07 03:22:26 +00:00
Nils Kneuper
131e1795de updated Czech translation
(cherry-picked from commit 725f6eba04e3f7ae10369e256e4b71ecd1520b00)
2018-10-07 03:22:26 +00:00
Iris Morelle
628d0d9ed2 Make Credits page on wiki.w.o use the new TOC markup for mobile support
[ci skip]

(cherry-picked from commit 45ab8e5b6229d40d3c23e2cd64d3c7922a1e55c8)
2018-10-07 03:22:25 +00:00
stevecotton
ae9559d8f0 DiD S2: When ambushed by goblins, cancel any pending attack (#3227)
This happens in a village-capture event, so the unit has finished
moving for this turn in any case.

(cherry-picked from commit 8d055bf038624fc61d965049832722555711af8a)
2018-10-07 03:22:25 +00:00
Nils Kneuper
98cc5372a7 updated Scottish Gaelic translation
(cherry-picked from commit f8742ccce40ecf3be3eaf1afa437de7d7ed4d733)
2018-10-07 03:22:25 +00:00
Nils Kneuper
e78bb6c086 updated French translation
(cherry-picked from commit e464082e0629522330eefcabcca5da811e4b316f)
2018-10-07 03:22:25 +00:00
Nils Kneuper
c0f6c6c540 updated Spanish translation
(cherry-picked from commit ca25c0dc5c519a66f19146240273712a2264b81a)
2018-10-07 03:22:24 +00:00
Charles Dang
965b5e1648 Unit Attack: fixed issues arising from displayed items potentially not equally available items
Since there were weapons included that weren't shown, it was possible for the best
weapon selection to be a hidden one (in which case, the initial selection would be
wrong, and it was possible for the returned index to point to a hidden, disabled
weapon.

This resolves both issues by excluding these disabled attacks from the weapon choices
list altogether. They aren't considered when calculating the best attack either.

mouse_handler::fill_weapon_choices is also used in mouse_handler::attack_enemy_, but
I don't foresee this change should cause any issues there, since you aren't supposed
to be able to actually attack with disabled weapons anyway.

(cherry-picked from commit 00e58f12f9a57b2e25dd4f67efb1255b177e173b)
2018-10-07 03:22:24 +00:00
Severin Glöckner
322afd978a Tutorial: show the female fighteress in the help (if she is chosen)
Uses the workaround mentioned in #3012

[ci skip]

(cherry-picked from commit 18a101be6650fa19da900e680a29a39049ce69c0)
2018-10-07 03:22:24 +00:00
Thom Diment
f5c791d598 UtBS 5: changes to scenario locations (#3104)
* UtBS 5: changes to scenario locations

Fixes #3077:
* Moved AI leader spawns to keeps
* Changed spawn of trolls that were spawning in walls
* Sanity-checked village ownership in cavern

Fixes #3078:
* Changed spawn of Eastern Troll Flamecaster
* Fixed entry routes of Troll Flamecasters

From author notes:
* Made 'Wounded Dwarf' a wounded unit

(cherry-picked from commit 7feb9aee113def823d506f987d0bee737da60ed7)
2018-10-07 03:22:23 +00:00
Charles Dang
d8086b1d35 Fixup this atomic_bool again
Apparently atomic types aren't copy-assignable.

(cherry-picked from commit 424e0e0ab44f51932c25e7bad364a9602f6c8bc5)
2018-10-07 03:22:23 +00:00
Charles Dang
cb90af3afe Added missing <atomic> include
(cherry-picked from commit bc0ad54ab096501d01e05f71a9299d67a970eb1e)
2018-10-07 03:22:23 +00:00
Charles Dang
a13791c23b GUI2: removed now-redundant type parameter from build_single_widget_and_cast_to
(cherry-picked from commit 34195ae6548131ef00aa894b4f82c7312fa140da)
2018-10-07 03:22:23 +00:00
Charles Dang
1b547fec0a GUI2: added a public static type getter to all widgets implementing get_control_type
Fixes #2400. See comment in styled_widget.hpp for details.

(cherry-picked from commit 52f7fcf5cc3d7446904df90381f467d15d4f5aad)
2018-10-07 03:22:22 +00:00