72475 Commits

Author SHA1 Message Date
Iris Morelle
3505af2f09 gui2/unit_create: Do not exclude do_not_list units
This is a debug mode-only dialog. If I want to spawn a unit, the game
had better allow me to spawn any unit I want. do_not_list was created
for use by wmlunits anyway.

(cherry-picked from commit 085236f556dd485fe186473208bdf4438ec4826d)
2018-10-07 03:22:18 +00:00
Jyrki Vesterinen
bcc914bfe8 Fix #2602: music doesn't change immediately on loading a save
This time I added an option to disable the feature to allow the currently
playing track to finish when changing the playlist. This allows more
fine-grained control of distinct use cases.

In wesnoth.cpp:do_gameloop(), I reversed the order of the title screen
music and default music because otherwise adding the default music would
enable play_once for the title screen music and prevent instant music
change when the player loads a save. I play title screen music with
immediate=yes, so it's still played first.

(cherry-picked from commit 91afbfd5868595e29a3147748c78652c88d6323e)
2018-10-07 03:22:18 +00:00
Jyrki Vesterinen
de1bdba769 Revert "Fix #2602: music doesn't change immediately on loading a save"
This reverts commit 94b69e028125f344dbb0e8fc1a76845891b291f2.

(cherry-picked from commit cafede479c70cbc2d70d052fd0c51e5c5440fa57)
2018-10-07 03:22:18 +00:00
loonycyborg
f8361aa7d1 wesnothd: fix server terminating in response to unregistered login
if unregistered logins are allowed

(cherry-picked from commit 0c0bf7f91d7654a7ac83861236b5e0589e1bbcaf)
2018-10-07 03:22:18 +00:00
loonycyborg
e1a7e08a92 wesnothd: avoid needlessly casting pointer to long int
(cherry-picked from commit a25180893344c6a99013e6b94eb3cb7110b1d987)
2018-10-07 03:22:17 +00:00
Iris Morelle
7b604c2a89 Fall back to the unit type name for [message] captions for nameless units
Fixes #3211.

(cherry-picked from commit 051182fa1c6fa75184d991920ff4e8e84831a848)
2018-10-07 03:22:17 +00:00
Jyrki Vesterinen
d5f66e229f Changelog entry for commit 94b69e028125f344dbb0e8fc1a76845891b291f2
(cherry-picked from commit b7c1007f34f6e5ff9c15e14b4cf1334b45749237)
2018-10-07 03:22:17 +00:00
Jyrki Vesterinen
097244559f Fix #2602: music doesn't change immediately on loading a save
(cherry-picked from commit 94b69e028125f344dbb0e8fc1a76845891b291f2)
2018-10-07 03:22:16 +00:00
sigurdfdragon
ae67350fd9 Update changelogs
(cherry-picked from commit c9c689da668e40d17e54cb8b2d8479a9df7149fc)
2018-10-07 03:22:16 +00:00
sigurdfdragon
009e789b8b DW: Fix #3207
...by preventing any allied units from moving to the sword.

(cherry-picked from commit 85ba7797b23fd2a98af33b61bfe22ea3e5f56f94)
2018-10-07 03:22:16 +00:00
Iris Morelle
5c04fe72d5 Don't allow [kill] animate=yes to scroll to units through fog and shroud
Restores 1.12's behaviour.

(cherry-picked from commit 4e37cdc713d054a48b1f31f43cb5511f42626847)
2018-10-07 03:22:15 +00:00
Severin Glöckner
8d282c97af NR S5a: more bugfixes
* now the situation can appear that spiders can attack Malifor,
  this handles it.
* add *^Xo Terrain to the filter. While there is no bug to fix,
  it looks like it belongs there too.
* work around a tile glitching with an [item] at 22,4
* remove code referring to removed variables

* and run wmlindent

[ci skip]

(cherry-picked from commit fc427ce58c6ce2c3948711207e67c646d2295951)
2018-10-07 03:22:15 +00:00
Thom Diment
72775f4ebd NR5_1: Fixes to Malifor attack and secret door events (#3154)
NR S5a: bugfixes

* Fixes #3117 - Malifor damage event now occurs on defence as well on attack

* Fixes #3116: - Doors to the study can now be opened from inside

[ci skip]

(cherry-picked from commit 913b77d79d9ac0fb4d67ac1461811aeb691daa60)
2018-10-07 03:22:15 +00:00
loonycyborg
77376ff378 wesnothd: restore lan server auto-shutdown functionality
(cherry-picked from commit 4eea1b5f0d4a0de9155c23be8a5abe097cf23f09)
2018-10-07 03:22:15 +00:00
loonycyborg
d3a6580908 wesnothd: restore functionality to log stats every 5 minutes
(cherry-picked from commit 0714d488bcd1eadd37c7785a1066925d5fa1b0d8)
2018-10-07 03:22:14 +00:00
loonycyborg
361c98c91c Update server to use new way of getting wesnoth version
(cherry-picked from commit 57da02a9196f6b616ade01cda3de08f2d40ba554)
2018-10-07 03:22:14 +00:00
loonycyborg
3ef2eb1ae5 server: remember client's ip in player_connections_ and use it in remove_player()
this is needed so ip is properly logged even if socket is closed or invalid

(cherry-picked from commit aaabbf2687ea0bc25dc3a9f8705fe0b6f29c1af2)
2018-10-07 03:22:14 +00:00
Severin Glöckner
2305281666 remove a duplicated space in a translatable string
...thiugh, in this case it has no effect.

[ci skip]

(cherry-picked from commit 4b7a6a98eccc07fd762ec29bcf1cd1ea84636992)
2018-10-07 03:22:13 +00:00
Charles Dang
cc3e79c0a5 Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]

(cherry-picked from commit c7a06939abcc44a9f6d20d5e974ef4dc87b3e34d)
2018-10-07 03:22:13 +00:00
Gunter Labes
e4100fc3bd check for empty parameters before looping over all players
(cherry-picked from commit 0362e36305eda584d16fb89de40f9314278316e0)
2018-10-07 03:22:13 +00:00
gfgtdf
1a72f04d4a rename mp command player_version to version
(cherry-picked from commit 0853b2718d1344449a23ae68252330d457f29f3a)
2018-10-07 03:22:13 +00:00
gfgtdf
454c44f8bb add player_version mp command
to tell you what wesnoth version another player is using.

(cherry-picked from commit ba6afa4d1706a30c067a15ab26c1ab3b9ef5b87b)
2018-10-07 03:22:12 +00:00
Nils Kneuper
34fb36934e updated French translation
(cherry-picked from commit ad0b8bce8ca8d4c84dab205b6ed7608c437cd87e)
2018-10-07 03:22:12 +00:00
Nils Kneuper
a267018b2e updated Italian translation
(cherry-picked from commit 87552f083b115cabef0a4d981e4913cd7c43a15c)
2018-10-07 03:22:12 +00:00
Nils Kneuper
320b2f321f updated Chinese (Traditional) translation
(cherry-picked from commit 3a8343b4dd478497d1f2dd428e391f64b640a8b1)
2018-10-07 03:22:11 +00:00
Charles Dang
0313deefe9 Game Config Manager: handle clearing image cache in main thread
See comment for explanation. This was a better solution that adding mutexes to
the cache accessors; that had performance downsides.

(cherry-picked from commit 011cbfe3b8fd2d634e3294484f4cb9b255eac029)
2018-10-07 03:22:11 +00:00
Charles Dang
1ec69044fb Revert "Fixed an occasional crash resulting from multi-thread access of the image cache"
This reverts commit 6d0b7c84243aba8444f5e722cd855feed3501f12. Turns out there's
a better way to fix this problem without using mutexes, which have a noticeable
performance hit (5.2% of the execution time of game_display::draw_invalidated()
according to @jyrkive).

(cherry-picked from commit b8ad791a1d8d1e76d921d4f48a6fd57aee3c134e)
2018-10-07 03:22:11 +00:00
Charles Dang
a5b8053340 Campaign Dialog: renamed Deterministic Mode label to "Save random seed"
[ci skip]

This better conveys its behavior, especially with the introduction of the hidden PRNG
preference.

(cherry-picked from commit bf92dbbfd2c1699a9af11e6ddc1b850e154d16f9)
2018-10-07 03:22:11 +00:00
Charles Dang
49908e5cb9 NR S10 - 14: minor cosmetic map tweaks
[ci skip]

(cherry-picked from commit 20af37d527efdd476aa96cbe57aff071bf8b7dd5)
2018-10-07 03:22:10 +00:00
Charles Dang
01d81d29ad NR S13: further reduce enemy gold
[ci skip]

Also fixed an error in my last commit that gave your ally Dwarvish side *more*
gold on higher difficulties.

(cherry-picked from commit a46eaa28749e48cf4027d1ec4523439b8407bc9b)
2018-10-07 03:22:10 +00:00
loonycyborg
b3bd32a936 scons: add missing winapi lib dependencies to mingw build
(cherry-picked from commit d96d5c506c2d8c8f47984b2e1d4bf13111e195a2)
2018-10-07 03:22:10 +00:00
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