games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge pull request #4510 from vcmi/beta

Browse Source 
Merge beta -> master
This commit is contained in:
Ivan Savenko
2024-08-26 00:27:47 +03:00
committed by GitHub
parent f1be5b0e93 6fbfcef99e
commit a3e33215e3
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@@ -1,6 +1,7 @@
# 1.5.6 -> 1.5.7
* Fixed game freeze if player is attacked in online multiplayer game by another player when he has unread dialogs, such as new week notification
* Fixed possible game crash after being attacked by enemy with artifact that blocks spellcasting
* Fixed heroes on map limit game setting not respected when moving hero from town garrison.
* Add workaround to fix possible crash on attempt to start previously generated random map that has players without owned heroes or towns
* Fixed crash on right-clicking spell icon when receiving unlearnable spells from Pandora

2
android/vcmi-app/build.gradle
View File

@@ -26,7 +26,7 @@ android {
minSdk = qtMinSdkVersion as Integer
targetSdk = qtTargetSdkVersion as Integer // ANDROID_TARGET_SDK_VERSION in the CMake project
versionCode 1570
versionCode 1572
versionName "1.5.7"
setProperty("archivesBaseName", "vcmi")

2
client/CPlayerInterface.cpp
View File

@@ -1010,7 +1010,7 @@ void CPlayerInterface::showInfoDialog(const std::string &text, const std::vector
}
std::shared_ptr<CInfoWindow> temp = CInfoWindow::create(text, playerID, components);
if (makingTurn && GH.windows().count() > 0 && LOCPLINT == this)
if ((makingTurn || (battleInt && battleInt->curInt && battleInt->curInt.get() == this)) && GH.windows().count() > 0 && LOCPLINT == this)
{
CCS->soundh->playSound(static_cast<soundBase::soundID>(soundID));
showingDialog->setBusy();

2
debian/changelog vendored
View File

@@ -2,7 +2,7 @@ vcmi (1.5.7) jammy; urgency=medium
* New upstream release
-- Ivan Savenko <saven.ivan@gmail.com> Fri, 23 Aug 2024 12:00:00 +0200
-- Ivan Savenko <saven.ivan@gmail.com> Mon, 26 Aug 2024 12:00:00 +0200
vcmi (1.5.6) jammy; urgency=medium

2
launcher/eu.vcmi.VCMI.metainfo.xml
View File

@@ -90,7 +90,7 @@
</screenshots>
<launchable type="desktop-id">vcmilauncher.desktop</launchable>
<releases>
<release version="1.5.7" date="2024-08-23" type="stable"/>
<release version="1.5.7" date="2024-08-26" type="stable"/>
<release version="1.5.6" date="2024-08-04" type="stable"/>
<release version="1.5.5" date="2024-07-17" type="stable"/>
<release version="1.5.4" date="2024-07-12" type="stable"/>