72725 Commits

Author SHA1 Message Date
Iris Morelle
373437ec70 pofix: Add rules for whitespace/dot count-changing commits
[ci skip]

(cherry-picked from commit aa1976f090a2d9fc80b6f8d564a6fc855dee2c28)
2018-10-07 03:23:18 +00:00
Iris Morelle
31aaabb92e Fix excessive dots in ellipses in several mainline scenarios
[ci skip]

(cherry-picked from commit de8d468b14119d7486bbbb782a2aabce1b650991)
2018-10-07 03:23:15 +00:00
Iris Morelle
34545ba9e4 gui2/preferences: Use curly quotes in quoted text in tooltips
[ci skip]

(cherry-picked from commit b8b403185eb81a239b5ab130fcf32698ac3de1d1)
2018-10-07 03:23:15 +00:00
josteph
0396437f18 Help: only use male_name/female_name if the unit has male/female variants.
(cherry-picked from commit dcbdac8ab5d593d31faa04f6069da8ae5c6744c5)
2018-10-07 03:23:15 +00:00
josteph
cb88a7a232 Help: Use female_name and name as fallback when male_name is empty and don't list hidden traits.
This algorithm was lifted from help::generate_trait_topics().

Fixes #3284

(cherry-picked from commit a4b0de5ece5a9bf1edac3b6f49dfac647ff1194f)
2018-10-07 03:23:15 +00:00
josteph
613ea51823 THoT S7: Select Darchas so the narrator's reference to him isn't dangling.
(cherry-picked from commit 29e814d8f4b15a4edae973837e81e85295494bb4)
2018-10-07 03:23:14 +00:00
Severin Glöckner
ecfd0f54f1 TSG 04: Better implementation to protect the magican
The player can all the time view the stats of any unit in the sidebar. This allowed to
see that he doesn't attack because he has only one move. There is no way to see the
movement costs directly, and as long as they are higher than the max_moves it's not
possible to figure out that this is not AI behavior but a game restriction.

Additionally, as the player has to kill both leaders to continue, try to not let the
player camp around the castle for the rest of the game, by giving the leader a possiblity
to attack if he recruited last turn a unit.

[ci skip]

(cherry-picked from commit 7ea951d5b9cf36986c51d1d8d603bc87ae559286)
2018-10-07 03:23:14 +00:00
Jyrki Vesterinen
3b26cc15e3 Damage prediction: round very close slow probabilities to 0 or 1
In the case in bug #3321, damage prediction code somehow receives a
combatant whose probability to be slowed is very close to one of those
values but not quite it. I couldn't figure out how it's possible because
only damage prediction code itself is supposed to emit slow probabilities,
and it's not producing such a probability in this case.

Without more information, I'm simply fixing the bug by force. If the
probability is in the problematic area, we simply round it to 0 or 1. This
way such probabilities are impossible later on when we try to scale the HP
distributions so that they add to 1.

Fixes #3321.

(cherry-picked from commit 00d8548c24a70365f1b02116e129c8835dff206a)
2018-10-07 03:23:14 +00:00
Severin Glöckner
40dc80f02f slight text edits
- missing dots in some MP strings
- superfluous space in some MP strings
-ran wmlinden on UtBS scenarios

[ci skip]

(cherry-picked from commit 5bd6221c44d1523b210bf9eaa5cf693cde350221)
2018-10-07 03:23:13 +00:00
Severin Glöckner
9cacb51351 Replace deprecated macro with terrain code in MP: Tombs of Kesorak
[ci skip]

(cherry-picked from commit 2a5ea00ad04f5b879ab316aae9578c29378eabb8)
2018-10-07 03:23:13 +00:00
Severin Glöckner
8508964935 Change campfire timezones in MP: Tombs of Kesorak
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

For the always dark one exists no immage, uses one from after the fall,
with slightly adjusted ToD shifting as it looked to weak.

The 1 hex small campfires look best with dusk.

part of #3056

[ci skip]

(cherry-picked from commit f5890c10a21451b0477ca13956bb6f9124ce621e)
2018-10-07 03:23:13 +00:00
Severin Glöckner
dc2b794351 Change Campfire timezones in TSG S8b
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is an visual change, no gameplay changes included.

Due to the lack of a save I could not view the result myself,
I chose the ToD shifting colors based on the other scenarios.

part of #3056

[ci skip]

(cherry-picked from commit f2a1acd97e76dd89a7830904f596c3d19984c1fa)
2018-10-07 03:23:13 +00:00
Severin Glöckner
e4418de7ff Change campfire timezones in UtBS S3
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

The ToD shifting for 'dawn' looked better than for 'dusk', and was
conidered better looking than having no ToD shift compared to the
surrounding.

part of #3056

[ci skip]

(cherry-picked from commit c7d8d232563e665cdfc0bcde201d780a511a4d93)
2018-10-07 03:23:12 +00:00
Celtic Minstrel
494ba287ec Fix incorrect formatting of probabilities in the sidebar
This resulted from an incorrect use of std::setprecision, which sets the number of significant figures to display, not the number of decimal places.

(cherry-picked from commit 41e757be9fc42da21f772c68a4c6877c135b810d)
2018-10-07 03:23:12 +00:00
josteph
a930dc28a9 WML: Don't add a \n before condition=lose objectives if there are no objectives listed before them.
(cherry-picked from commit 045d331da8cc8120e4a5affd639ce389e344bc16)
2018-10-07 03:23:12 +00:00
Choicerer
bdabd78439 Fix team chat not being marked on remote clients (#3314)
Fixing the lack of stars on the remote client when sending a team/observer message.
This commit didn't modify the necessary lines in replay.cpp:
6aa3b3b
(of which the chat_msg::chat_msg one has already been fixed)

Fixes #3119

(cherry-picked from commit 02bdd179946ae1eef3424541115e529e758b8fc0)
2018-10-07 03:23:12 +00:00
Choicerer
12c7a950d2 Fixes broken tooltips for the unit_side flag and the unit name. (#3315)
Fixes #3306

(cherry-picked from commit f50b644c30e126d53db54d5a342f3be4dc0461c8)
2018-10-07 03:23:11 +00:00
Severin Glöckner
9093a2c9f0 NR: Disallow lvl 0 recruits after scenario 5.
Don't bother carrying them through the whole campaign.
This scenario seems like a good time, because there begins a new episide in the story
and all the level 1 advancement are available now too.

closes #3074

[ci skip]

(cherry-picked from commit 785f91065b212dbf8cc7462a02cc594de0f60f53)
2018-10-07 03:23:11 +00:00
sigurdfdragon
9384019393 SotA S21: Set facing for naga appearance
(cherry-picked from commit d22c1746e89cb7369b2ca502d16124f4e978b329)
2018-10-07 03:23:11 +00:00
sigurdfdragon
f20ceac0f6 Update changelog
(cherry-picked from commit 7d60eeeefb65cc80e6e25162443422d33ae963eb)
2018-10-07 03:23:11 +00:00
sigurdfdragon
193fe4accd SotA S11 & 21: Fix #3294
Adjust units to have appropriate gender for story reasons.

(cherry-picked from commit 2f710f83bf5f7b5086ef66ec49aaef4c156b75bd)
2018-10-07 03:23:10 +00:00
sigurdfdragon
885700ecf7 SotA S16: Simplify dialog to fix #3291
(cherry-picked from commit fd43d8454ce418c207aebb16ba8908af5a6e2799)
2018-10-07 03:23:10 +00:00
Severin Glöckner
eceb09dc56 DiD S10: add a redraw
apparently it happens normally only after dismissing the objectives

[ci skip]

(cherry-picked from commit a62264412d54157184ce8b6250520238f2421aaf)
2018-10-07 03:23:10 +00:00
Severin Glöckner
80846a1a78 TSG S4: prevent leader of the undeads from suiciding
This is generally a problem with most leaders, but here it's worse.

Also changed his keep to the ruined version.
(Not the ajdacent castle tiles as it looks better that way.)

[ci skip]

(cherry-picked from commit 090ad3140fd606f1531058f58322ea7b9b6018d2)
2018-10-07 03:23:09 +00:00
Severin Glöckner
31e26a4215 wmlxgettext: insert links which use ssl
[ci skip]

(cherry-picked from commit a66b30312bd2bc80f07490216b8120e1d32e3e01)
2018-10-07 03:23:09 +00:00
newfrenchy83
753f1fb3e5 Update CB project (#3307)
(cherry-picked from commit 411eb6105dccc83fa0adbb6ac7b107788947a81f)
2018-10-07 03:23:09 +00:00
Severin Glöckner
267c00edd7 TSG S5: fix an unlikely scenario outcome
In case the player goes south and runs away fromt he bandits, and defeats
the lich first, then the choice to side or not with the bandits would
happen very late.
In case he allied with them and the other undead leader still lived, he
could end the scenario still by triggering "enemies defeated". If they were
already defeated, the scenario could not end anymore. Furthermore, the
storytext doesn't make sense anymore, at least the ending dilogue would
miss,
In case of siding with the elves one can still win by defeating Urza Afalas.
and the story still makes sense,

To solve this, in this special situation the player has no choice anymore,
the path of the elves is chosen.

(the diff may be hard to read; a good part has been wrappend with an [if])

[ci skip]

(cherry-picked from commit 5dc80e7428a22611bbcbeecd9be05b2a0f253106)
2018-10-07 03:23:09 +00:00
josteph
f017725b57 TSG S05: Merge all instances of [objectives].
Suggested by @sevu.

(cherry-picked from commit ea62caadf0b23d61accf56f66611d4c781a424f1)
2018-10-07 03:23:08 +00:00
josteph
14e4115193 TSG S05: Hide completed objectives.
Fixes #3031.

(cherry-picked from commit f4ba5cbcb84684907e0617df763814016563eeaa)
2018-10-07 03:23:08 +00:00
Charles Dang
5cca1478d2 Fixup 7807694
[ci skip]

(cherry-picked from commit c39aa72f56930f9d8d062250f55c5b97883c5007)
2018-10-07 03:23:08 +00:00
Charles Dang
5addcb9a97 DiD S6: fixed previously stored orc leader ending up in the wrong place (fixes #3304)
[ci skip]

(cherry-picked from commit 78076941a07a15d4b3b2e99cbc200730567e4fe3)
2018-10-07 03:23:08 +00:00
Martin Hrubý (hrubymar10)
d3d3e19275 Fix Xcode project after 458dd284b8342b33e6a6359aefbbbdb386b28875
(cherry-picked from commit dc6d5850f552bbccc2b21ea3d7e6d8b4539e1915)
2018-10-07 03:23:07 +00:00
Charles Dang
a72b344029 Updated VS projectfile
[ci skip]

(cherry-picked from commit 162b9de330322edf9723ef2cbed02978b7a38571)
2018-10-07 03:23:07 +00:00
Charles Dang
c6e9efde9c GUI2: removed 2010 experimental listbox
This was never finished, is not maintained, suffers from a lack of features the "old" listbox
class now has, and seems (according to the logs) to be have been superceded by the pane widget.
At the very least, the pane widget seems to be what mordante was working with in his early
prototype of a new addon manager, and not this 2010 list class.

(cherry-picked from commit 458dd284b8342b33e6a6359aefbbbdb386b28875)
2018-10-07 03:23:07 +00:00
Severin Glöckner
398165631c copied German translation to maser
primary reason is rather to have less problems if
someone uses the master files when translating for 1.14

[ci skip]

(cherry-picked from commit 9a37fe3a072ecd15ba8e196adcfac7e6a12e5444)
2018-10-07 03:23:06 +00:00
Nils Kneuper
19f83246d2 updated Chinese (Traditional) translation
(cherry-picked from commit 478df79f3135a282aa0d4c156d202e5ce2c6030e)
2018-10-07 03:23:06 +00:00
newfrenchy83
f551e5ca8e Enable C++17 in Code::Blocks
(cherry-picked from commit 882eeb52ab38547004f2ba7249913323596188d7)
2018-10-07 03:23:05 +00:00
Jyrki Vesterinen
591494627d Fix build
(cherry-picked from commit d8eada856aa5323e451551c86ec9c1ef15337ee0)
2018-10-07 03:23:05 +00:00
Jyrki Vesterinen
58dae34823 Remove unnecessary heap allocation
(cherry-picked from commit 3a5c2df0a15448c753e1eb19419d4b05b07e475c)
2018-10-07 03:23:05 +00:00
Charles Dang
130bd95e27 MP Join Game: cleaned up implementation of the recent players-choose-factions changes
(cherry-picked from commit fa01fb14d24f9f2830c7411cbabae88fd8a2d228)
2018-10-07 03:23:05 +00:00
gfgtdf
c112f49041 fix code dublication of mp_join_game::show_flg_select
this also fixes a bug where the side number in the initial flg dialog would be off by one.

This is also a slight behviour change where not finding [era] in mp_join_game::fetch_game_config no longer throws config::error but just returns false (=cannot join game)

(cherry-picked from commit a2a4dff050713e96b0b14612486d82cf3f93fa3d)
2018-10-07 03:23:04 +00:00
gfgtdf
6ad9977886 add a comment
(cherry-picked from commit 0296b6068cad37db4034b1edcc33025e3be82987)
2018-10-07 03:23:04 +00:00
gfgtdf
dd1960d988 mp join: fix crash when the dialog is updated while the flg dialog is open.
we cannnot call show_flg_select from inside the select_leader_buttons callback because that select_leader_buttons might be deleted/recreated while that dialog is open whihc leads to crashes, so what we do is executing the show_flg_select
 in a seperate callstack by using a 0 ms non-repeating timer

(cherry-picked from commit c55512755237dc818abc3b6bce4c3d31dbd2449b)
2018-10-07 03:23:04 +00:00
gfgtdf
745abef62d cancel faction_select when the game starts
or when the hosts assigned  control of  that side to another player.

(cherry-picked from commit 2dd65574498a9731b501e18da04c01f959ab6654)
2018-10-07 03:23:04 +00:00
gfgtdf
45fd7c9011 make flg manager not store confg& side_
in the non-host case the clients might get updates that change the [side] config while the flg dialog is open which might result in invalid pointers,  note that flg_manager::default_leader_cfg_ is still there but this is no problm because that is never dereferenced it's only compared to other pointers.

we also make a copy of all [multiplayer_side] on the non hosts side for the same reason.

(cherry-picked from commit c805897797d7ff22f3ea4fd1ce9c0fb126baefea)
2018-10-07 03:23:03 +00:00
gfgtdf
5a39a62118 allow non hosts to change factions later.
previously players had to leave an rejoin the game to change their faction.
this was most annoying in coop games where you want might want to choose
your faction in consultation with the other players. Also you previously could
not even checkout the different available factions again after you joined
the game.

(cherry-picked from commit 5ba389111eaa5d08f55d60c1b437c250a329bc58)
2018-10-07 03:23:03 +00:00
gfgtdf
2709456d2f disallow attacking with disabled attacks via [do_command]
this fixes some rare cheats in mp.

(cherry-picked from commit 26b5ca55e40176f338265b162178df7342ec2882)
2018-10-07 03:23:03 +00:00
pentarctagon
27ea9ccd24 Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.

(cherry-picked from commit 649fdc9a6204cc4e2019aac41a79910b493b7d5a)
2018-10-07 03:23:02 +00:00
Charles Dang
39edd7c0c6 Preferences: added a mention of the in-game accelerated speed toggle
[ci skip]

(cherry-picked from commit 98ddc311fc1cfec3c95c2c24cc1e3e48603643a8)
2018-10-07 03:23:02 +00:00
Charles Dang
ff7f3c06a0 Preferences: shifted the Skip AI Moves button around
[ci skip]

Makes it clear it's not intrinsically tied to the Accelerated Speed factor.

(cherry-picked from commit 10e663ed6ce49974e22d4dab5211716210ead6e9)
2018-10-07 03:23:02 +00:00