From d72911dd1d8cc43b8a720c9ae00e70624d4002a9 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sun, 2 Feb 2025 12:02:38 +0000 Subject: [PATCH 1/6] Version bump to 1.6.5 --- android/vcmi-app/build.gradle | 4 ++-- cmake_modules/VersionDefinition.cmake | 2 +- debian/changelog | 6 ++++++ docs/Readme.md | 2 +- launcher/eu.vcmi.VCMI.metainfo.xml | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/android/vcmi-app/build.gradle b/android/vcmi-app/build.gradle index d124db866..44c65f1f9 100644 --- a/android/vcmi-app/build.gradle +++ b/android/vcmi-app/build.gradle @@ -26,8 +26,8 @@ android { minSdk = qtMinSdkVersion as Integer targetSdk = qtTargetSdkVersion as Integer // ANDROID_TARGET_SDK_VERSION in the CMake project - versionCode 1642 - versionName "1.6.4" + versionCode 1650 + versionName "1.6.5" setProperty("archivesBaseName", "vcmi") } diff --git a/cmake_modules/VersionDefinition.cmake b/cmake_modules/VersionDefinition.cmake index f050c701a..596e2fbea 100644 --- a/cmake_modules/VersionDefinition.cmake +++ b/cmake_modules/VersionDefinition.cmake @@ -1,6 +1,6 @@ set(VCMI_VERSION_MAJOR 1) set(VCMI_VERSION_MINOR 6) -set(VCMI_VERSION_PATCH 4) +set(VCMI_VERSION_PATCH 5) add_definitions( -DVCMI_VERSION_MAJOR=${VCMI_VERSION_MAJOR} -DVCMI_VERSION_MINOR=${VCMI_VERSION_MINOR} diff --git a/debian/changelog b/debian/changelog index e9a927777..c8c76db54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vcmi (1.6.5) jammy; urgency=medium + + * New upstream release + + -- Ivan Savenko Mon, 3 Feb 2025 12:00:00 +0200 + vcmi (1.6.4) jammy; urgency=medium * New upstream release diff --git a/docs/Readme.md b/docs/Readme.md index 78b0b2a12..cc23351bd 100644 --- a/docs/Readme.md +++ b/docs/Readme.md @@ -1,9 +1,9 @@ # VCMI Project [![VCMI](https://github.com/vcmi/vcmi/actions/workflows/github.yml/badge.svg?branch=develop&event=push)](https://github.com/vcmi/vcmi/actions/workflows/github.yml?query=branch%3Adevelop+event%3Apush) -[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.2/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.2) [![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.3/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.3) [![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.4/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.4) +[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.5/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.5) [![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/total)](https://github.com/vcmi/vcmi/releases) VCMI is an open-source recreation of Heroes of Might & Magic III engine, giving it new and extended possibilities. diff --git a/launcher/eu.vcmi.VCMI.metainfo.xml b/launcher/eu.vcmi.VCMI.metainfo.xml index 007b2c517..2fd872f8a 100644 --- a/launcher/eu.vcmi.VCMI.metainfo.xml +++ b/launcher/eu.vcmi.VCMI.metainfo.xml @@ -90,6 +90,7 @@ vcmilauncher.desktop + From 9b5dade8b24837b7cdc543015b31a8c7fd95c73b Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sun, 2 Feb 2025 12:03:24 +0000 Subject: [PATCH 2/6] Changelog for 1.6.5 --- ChangeLog.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index b0306356b..7cfd48962 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,22 @@ # VCMI Project Changelog +## 1.6.4 -> 1.6.5 + +### General + +* Fixed corrupted graphics of generated assets like water tiles on mobile systems +* All generated assets are now used directly from memory without saving them to disk + +### Stability + +* Fixed regression causing crashes in combat when touchscreen input is in use +* Fixed regression causing crash on attempt to upscale empty image +* Fixed crash on some creature abilities from mods that cast targeted spells on unit with battle propagator +* Fixed crash on accepting next turn in multiplayer when local player has game settings window open +* Fixed crash in multiplayer when one player changes his starting options while another player has hero overview window open +* Fixed crash on double-clicking login to global lobby button +* Fixed possible crash on game shutdown + ## 1.6.3 -> 1.6.4 ### General From d5feedae60053f6f1ffe0da92b0b3d97cb9f8b44 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 3 Feb 2025 11:41:17 +0000 Subject: [PATCH 3/6] Fix broken icons in commander window --- Mods/vcmi/Content/Sprites/stackWindow/switchModeIcons.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mods/vcmi/Content/Sprites/stackWindow/switchModeIcons.json b/Mods/vcmi/Content/Sprites/stackWindow/switchModeIcons.json index a870ed04b..314a7243e 100644 --- a/Mods/vcmi/Content/Sprites/stackWindow/switchModeIcons.json +++ b/Mods/vcmi/Content/Sprites/stackWindow/switchModeIcons.json @@ -1,7 +1,7 @@ { "images" : [ - { "frame" : 0, "file" : "SECSK32:69"}, - { "frame" : 1, "file" : "SECSK32:28"} + { "frame" : 0, "defFile" : "SECSK32", "defFrame" : 69 }, + { "frame" : 1, "defFile" : "SECSK32", "defFrame" : 28 } ] } From 1421db13eada77f23a650de3523f5ec21e843b5e Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 3 Feb 2025 11:42:04 +0000 Subject: [PATCH 4/6] Do not attempt to load screenshot list from local mod.json --- launcher/modManager/modstate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/modManager/modstate.cpp b/launcher/modManager/modstate.cpp index 61b17b613..39b9c8c22 100644 --- a/launcher/modManager/modstate.cpp +++ b/launcher/modManager/modstate.cpp @@ -71,7 +71,7 @@ QStringList ModState::getConflicts() const QStringList ModState::getScreenshots() const { - return stringListStdToQt(impl.getLocalizedValue("screenshots").convertTo>()); + return stringListStdToQt(impl.getRepositoryValue("screenshots").convertTo>()); } QString ModState::getBaseLanguage() const From d2fbb64b797869a68e8fe30e4b7893cbba98c4f8 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 3 Feb 2025 11:43:14 +0000 Subject: [PATCH 5/6] Revert previous commit - seems to be causing more crashes than it fixes --- client/gui/CGuiHandler.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/client/gui/CGuiHandler.cpp b/client/gui/CGuiHandler.cpp index 9dfe71703..6608ca44d 100644 --- a/client/gui/CGuiHandler.cpp +++ b/client/gui/CGuiHandler.cpp @@ -134,7 +134,6 @@ CGuiHandler::~CGuiHandler() // enforce deletion order on shutdown // all UI elements including adventure map must be destroyed before Gui Handler // proper solution would be removal of adventureInt global - windowHandlerInstance->clear(); adventureInt.reset(); } From 5f6a8d2a0bf3e5b976fc30dd27662d30161b9ac6 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 3 Feb 2025 11:45:57 +0000 Subject: [PATCH 6/6] Adjusted changelog --- ChangeLog.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7cfd48962..3926da88c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,8 @@ * Fixed corrupted graphics of generated assets like water tiles on mobile systems * All generated assets are now used directly from memory without saving them to disk +* Launcher will now correctly show screenshots for already installed mods +* Fixed broken icons in commander information dialog ### Stability @@ -15,7 +17,6 @@ * Fixed crash on accepting next turn in multiplayer when local player has game settings window open * Fixed crash in multiplayer when one player changes his starting options while another player has hero overview window open * Fixed crash on double-clicking login to global lobby button -* Fixed possible crash on game shutdown ## 1.6.3 -> 1.6.4