72394 Commits

Author SHA1 Message Date
loonycyborg
ffb078c119 scons: don't let pkg-config to add prefix on msys2
This is workaround for windows style path confusing scons if they appear
in CPPATH etc. Paths without prefix still happen to be valid and they
start with "/", not "c:".

(cherry-picked from commit b347bc70b163a572751b7ac72f23e472c3ac9238)
2018-10-07 03:22:09 +00:00
loonycyborg
13c5f02e04 scons: use pkg-config on msys platform for sdl
(cherry-picked from commit aa925e1fc6f64266b66fe63f16c19ef08a34362c)
2018-10-07 03:22:09 +00:00
loonycyborg
b7ee956d63 scons: set env["PLATFORM"] to "win32" on msys
(cherry-picked from commit d8743f8e6e51a30f0b039d40dc053b8e4dbf34b3)
2018-10-07 03:22:09 +00:00
loonycyborg
e54aa76700 scons: workaround for msys2's build's of sdl "#define main" breaking non-sdl checks
(cherry-picked from commit 2bc7cc3e6106d089f168510a2a12cc53bfd48007)
2018-10-07 03:22:09 +00:00
Charles Dang
d665a8810d NR S11 - 13: reduced enemy starting gold and income (resolves #3198)
[ci skip]

Also similarly reduced one of your ally's starting gold in S13.

(cherry-picked from commit 5adb931b2aafa1747dda62fad05a0b24754eedbd)
2018-10-07 03:22:08 +00:00
loonycyborg
2dbb8e48ee Change GL include in scons check so it actually works under mingw
(cherry-picked from commit f53237b20f09eba6701a90f7b5be81515317fc0d)
2018-10-07 03:22:08 +00:00
gfgtdf
69c978cb9e fix possible 'manditory child missing' when loading mp campaign games
the error could happen a soon as you advance to the next scenario if you reload a campaign save from another player.

(cherry-picked from commit 575e104ca58066315b2540cda1a6ae241937e885)
2018-10-07 03:22:08 +00:00
sigurdfdragon
a94a62c621 Update changelogs
(cherry-picked from commit 03d0e5deeeccf3bd6d3371a17ef22b922ad01d54)
2018-10-07 03:22:07 +00:00
sigurdfdragon
723d6dbc6a SotA S09: Fix #3192
...by making the filter more exact.

(cherry-picked from commit 047ededd9efa9008d931ca483e71b9cc0e582f6b)
2018-10-07 03:22:07 +00:00
loonycyborg
a86bb81abc scons: fix issue #3132
(cherry-picked from commit d35f22e0773abffdf54b591b75d6ffb75f3ff6a6)
2018-10-07 03:22:07 +00:00
Charles Dang
ca5b152f01 MP Lobby: added translation hints for C/S markers
(cherry-picked from commit 2503ac88978c8332085b2964154a6af4738cf610)
2018-10-07 03:22:07 +00:00
gfgtdf
da14573626 wb: fixup "fix incorrect handling of skirmisher."
(cherry-picked from commit 9cc32ebc46a006b70916572594c08cacfaad6571)
2018-10-07 03:22:06 +00:00
loonycyborg
f7ad6de3fd Enable ASLR and NX bit security features for mingw builds
(cherry-picked from commit 8b1a5c0dde9e1a36531e6d104737b40531e59cd0)
2018-10-07 03:22:06 +00:00
Charles Dang
ec9f2c8265 MP Staging: removed gender tooltip (resolves #2998)
I had only added it originally in case someone didn't know the symbols offhand,
but sevu is right that they can get a bit annoying.

(cherry-picked from commit 3d8d38983d1c5a6bfe542ee756b6ce3ac3471bd3)
2018-10-07 03:22:06 +00:00
Charles Dang
2d7c3e8f3e MP Lobby: display self before friends in player list (fixes #3185)
(cherry-picked from commit 6cc91794f544e16f2feca3cf0e26c070548d9483)
2018-10-07 03:22:06 +00:00
gfgtdf
2d6d43bcd1 fix seed not resetting in lua mapgen.
(cherry-picked from commit 0dd382eab32ed2255689d4bec7418d4d0bf5d040)
2018-10-07 03:22:05 +00:00
gfgtdf
1de83f64d4 add mapgen debug info.
(cherry-picked from commit 84d94ca30549ffa60fead6330f119accd8392d85)
2018-10-07 03:22:05 +00:00
gfgtdf
67b728a035 add mapgen debug info.
(cherry-picked from commit 8e3ee5c5976a91a97acc7efaca69c1a370863e7f)
2018-10-07 03:22:05 +00:00
gfgtdf
bdfd39d72b add mapgen debug info.
(cherry-picked from commit f69af8533a31e9820f188916e9466136360973e5)
2018-10-07 03:22:05 +00:00
gfgtdf
f05702abd6 fix unit filter always evaluating [and] even if it is not needed.
(cherry-picked from commit af6559af75efcb0cc7ff06b25f87f6135d167034)
2018-10-07 03:22:04 +00:00
Charles Dang
61bbdbb637 GUI2/Chatbox: removed spurious newline from initial PM notice
(cherry-picked from commit 8c3673dfa0dcc0bc056a20374ab6a3e48e2d3d43)
2018-10-07 03:22:04 +00:00
Pentarctagon
7dec6296b5 Fixup goblin description.
Somehow missed removing the part about the failing bloodline.

(cherry-picked from commit 9242a5ffd0db9a6bdeb65c498a7e3db852d60f21)
2018-10-07 03:22:04 +00:00
Pentarctagon
7cd78a6b12 Updated goblin spearman description.
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=48137&start=60#p628424 and related posts.

(cherry-picked from commit 0b7ca63a86157b8d6a82c1d59858bdd1713685f4)
2018-10-07 03:22:03 +00:00
Pentarctagon
56db59e1dc Add a couple missing things from the PR that added the units.
Added the elemental trait to the Jinn. Added the undead_variation key to the Jinn, Wyvern Rider, and Wild Wyvern.

(cherry-picked from commit d913aafc534ccaeb239cc910bd963893e313fdcf)
2018-10-07 03:22:03 +00:00
Byteron
54ca88468a TSG: Deoran can't recruit Peasants anymore
for the whole campaign, only in the first two scenarios

closes #3051 [ci skip]

(cherry-picked from commit 7f2a8f7c1971879956eaafe17f7ce0016d1f51d7)
2018-10-07 03:22:03 +00:00
Charles Dang
b239ac4850 Made vgettext/vngetext internals harder to use accidentally (resolves #2716)
Also removed the two implementation function overloads that did not take a textdomain.

(cherry-picked from commit aad64d72cf27123a45655fd23eacebec37fe4ab6)
2018-10-07 03:22:03 +00:00
Charles Dang
adaa115a7d GUI2/Dispatcher: added a connect_signal convenience wrapper for draw callbacks
Didn't use this in the window widget since that doesn't specify front_child as
the queue position. I need to evaluate whether draw callbacks need to be in that
position anyway. AFAIR I only started adding them there since I noticed the one
in the debug clock dialog used that.

(cherry-picked from commit 569d86277a0ee90385e7303dea80fd2d0da367d5)
2018-10-07 03:22:02 +00:00
Charles Dang
15206762cc Deployed std::make_unique and std::make_shared in more places
(cherry-picked from commit cc2cc29376fa19aa21b705a9754496d7f6d30162)
2018-10-07 03:22:02 +00:00
Nils Kneuper
355522656d updated French translation
(cherry-picked from commit 29c9f1d2983b280a946b1eb1781f6b93f8e9643c)
2018-10-07 03:22:02 +00:00
josteph
bd06263b50 fixup! Campaign Difficulty: colored description column gray
(cherry-picked from commit 8bdccca7e373f805d1f2ecfe772151141a7015a9)
2018-10-07 03:22:01 +00:00
Charles Dang
56a09abe8d Fixup f72f89f
(cherry-picked from commit 4b03168fec89b9d4c29af77111a50ce6b0467538)
2018-10-07 03:21:57 +00:00
Charles Dang
8749b97c0a Events: minor cleanup
(cherry-picked from commit eddbaa21593de3007e945a39f104c2a7d48bb284)
2018-10-07 03:21:57 +00:00
Charles Dang
075d793539 Campaign Difficulty: consolidated both lines into a single label
(cherry-picked from commit f72f89f4d562231f831793b3719a115a79cc102c)
2018-10-07 03:21:57 +00:00
Charles Dang
fbdc6814e0 Updated changelog
[ci skip]

(cherry-picked from commit 61694688a8e6afc66a34e7347f52b92f2b7a3102)
2018-10-07 03:21:56 +00:00
Charles Dang
504435023c Fixed an occasional crash resulting from multi-thread access of the image cache
This was a problem as of 52db950e94a5e09bdfb3ccc7056db3da90d70483 since the loading
screen could access the image cache while the worker thread cleared it.

(cherry-picked from commit 6d0b7c84243aba8444f5e722cd855feed3501f12)
2018-10-07 03:21:56 +00:00
Jyrki Vesterinen
6b5ce73605 Changelog entries
(cherry-picked from commit ae8baa63560bd89ffb6c0319fda4ee708ff40ff5)
2018-10-07 03:21:56 +00:00
Jyrki Vesterinen
da18a52ebe Fix #3042: attack prediction gives wrong results for HP <= 0 units
One_strike_fight() assumed that if HP distribution hadn't been calculated,
the unit is alive. It would normally be a valid assumption, but the Wesnoth
engine allows units with negative HP (although things aren't guaranteed to
work correctly in the presence of such units).

The assumption, together with a completely wrong calculation for the
probability that the opponent will counterattack, resulted in badly
incorrect results. That, in turn, caused the calculated probability that
the opponent to kill us to become negative (I observed -75 % when
debugging), making the calculated probability to be poisoned/slowed to
exceed 100 %, and that finally caused an assert if the AI simulated another
fight for the same unit.

I have now fixed those issues. I also noticed that rounding error allowed
the probability to be killed to still become slightly negative, and thus
changed std::min() to utils::clamp() to limit the value to the allowed
range.

(cherry-picked from commit 472b0cbbfbcdde4e32f26a1cb5afaa5ffd6c7a88)
2018-10-07 03:21:55 +00:00
Jyrki Vesterinen
cd2f8d21b8 Revert "Disallow units with negative HP"
This reverts commit ef60deaa2b0d14006a6747c61fdd4fd33562b6f0.

@ln-zookeeper pointed out that units with negative HP are documented in
the wiki, and thus disallowing them is an API
change.

(cherry-picked from commit 0200487aad71816b843a8c542b3b0c394c5c87d8)
2018-10-07 03:21:55 +00:00
Jyrki Vesterinen
1d8479d737 Revert "Allow modifying dead units in last_breath and die event handlers"
This reverts commit 15446acb2ad1fd7990e52e7194480820c4923596.

(cherry-picked from commit 050bb3fa2c8d3e1422fe11e56909cfaba63d9aac)
2018-10-07 03:21:55 +00:00
Jyrki Vesterinen
c0a5519a88 Revert "Throw a Lua exception when creating a negative-HP unit in a Lua context"
This reverts commit 258a0e4689e9c000e3e0017ceed5e120156883ae.

(cherry-picked from commit 58dca3a8848b66f92e4f2b228e775dde1b000634)
2018-10-07 03:21:55 +00:00
Jyrki Vesterinen
7566d1c35c Revert "Allow modifying dead units in more event handlers"
This reverts commit 9110e49760e40d9856b96f884f3c1636e034768c.

(cherry-picked from commit 70be1d2932be67e19dff5afd680c8405b3325b57)
2018-10-07 03:21:54 +00:00
Charles Dang
eb9a219c5f Used std::string::front() and back() in more places
(cherry-picked from commit ed8a8a48f70174dae128afbdb07b1488b5a8d1d9)
2018-10-07 03:21:54 +00:00
Iris Morelle
b7823147e5 pofix: Update with 1.14.1 -> 1.14.2 rules for the website
[ci skip]

(cherry-picked from commit 0ca822795903e7f0ac93e410b7dde0b8012048fe)
2018-10-07 03:21:54 +00:00
Celtic Minstrel
51e20c0180 Fixup previous commit
Accidentally removed the third parameter for `increase_movement` instead of `increase_accuracy`. Whoops!

(cherry-picked from commit d03829dfd097848efaa8a6be3359b481524ebf97)
2018-10-07 03:21:54 +00:00
Celtic Minstrel
3e3d353a54 Fix effects being unable to decrease weapon parry/accuracy
fixes #3181

(cherry-picked from commit 1413dfd4f387f589d59545f0a4cde665d0d1aac2)
2018-10-07 03:21:53 +00:00
Charles Dang
a053bb67fe Fixed CVIdeo::quit being swallowed in invoked_function_data::call
(cherry-picked from commit 8ecbed0205040b566e898f64eb15103162728ec2)
2018-10-07 03:21:53 +00:00
Charles Dang
26714a3bf9 Fixup 86792656aed (re-add ctor)
(cherry-picked from commit 5588588b55d7733dd912c887221670927443a9c3)
2018-10-07 03:21:53 +00:00
Charles Dang
0d30d3301a Handle exceptions thrown by call_in_main_thread in the caller thread
Also removes an unnecessary ctor and adds docs.

(cherry-picked from commit 86792656aed349b6ddc67e66b98abdee5fb310e2)
2018-10-07 03:21:52 +00:00
Nils Kneuper
fd58826730 updated Italian translation
(cherry-picked from commit 183bc272eaf867570bcf33a609aa6a8f89ec6d72)
2018-10-07 03:21:52 +00:00
Charles Dang
0b4e268218 MP Staging: simplify a call
(cherry-picked from commit 99c2ed8f65da39ef24dfd339eb12486275009eec)
2018-10-07 03:21:52 +00:00