Merge pull request #5644 from IvanSavenko/release_168

Release 1.6.8

ChangeLog.md

@@ -1,5 +1,26 @@
 # VCMI Project Changelog
 
+## 1.6.7 -> 1.6.8
+
+### Stability
+
+* Fixed crash when visiting Cannon Yard from HotA mod that was occuring on some systems
+* Fixed crash when moving through an event that gives enough experience to level up if the player is using instant movement speed
+* Fixed crash when trying to sort maps in reverse order that was occurring on some systems when there were multiple folders containing maps
+* Fixed crash when using one-click upgrade when unit upgrade cost is zero
+* Fixed crash on opening town screen with invisible buildings from mods
+* Fixed crash when a player changes their starting hero in multiplayer game while another player has town or starting bonus right-click popup open
+* Fixed crash when merging two units located in town garrison without a hero if both units are equipped with artifacts (WoG feature)
+
+### General
+
+* Fixed not working check for hypnotize spell effect presence
+* Fixed calculation of the total cost of the hero's movement path when the hero has spent some of his movement points today.
+* Fixed Launcher not closing after game start on Mac OS.
+* Launcher will no longer tracks clipboard state on mobile systems to prevent OS notifications
+* Automatic selection of xbrz2 upscaler now only happens on systems with 4GB of RAM
+* Game will now detect broken internal mod left over from VCMI 0.99 installations and notify player on startup instead of crashing
+
 ## 1.6.6 -> 1.6.7
 
 ### Stability

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 1670
-		versionName "1.6.7"
+		versionCode 1680
+		versionName "1.6.8"
 
 		setProperty("archivesBaseName", "vcmi")
 	}

client/adventureMap/AdventureMapInterface.cpp

@@ -779,8 +779,8 @@ void AdventureMapInterface::showMoveDetailsInStatusbar(const CGHeroInstance & he
 	const int movementPointsLastTurnCost = maxMovementPointsAtStartOfLastTurn - pathNode.moveRemains;
 	const int remainingPointsAfterMove = pathNode.moveRemains;
 
-	int totalMovementCost = 0;
-	for (int i = 0; i <= pathNode.turns; ++i)
+	int totalMovementCost = hero.movementPointsRemaining();
+	for (int i = 1; i <= pathNode.turns; ++i)
 	{
 		auto turnInfo = hero.getTurnInfo(i);
 		if (pathNode.layer == EPathfindingLayer::SAIL)

client/mapView/MapViewActions.cpp

@@ -109,6 +109,9 @@ void MapViewActions::mouseDragged(const Point & cursorPosition, const Point & la
 
 void MapViewActions::mouseDraggedPopup(const Point & cursorPosition, const Point & lastUpdateDistance)
 {
+	if(!settings["adventure"]["rightButtonDrag"].Bool())
+		return;
+
 	dragActive = true;
 	owner.onMapSwiped(lastUpdateDistance);
 }

client/windows/GUIClasses.cpp

@@ -1479,7 +1479,7 @@ CObjectListWindow::CItem::CItem(CObjectListWindow * _parent, size_t _id, std::st
 
 	setRedrawParent(true);
 
-	text = std::make_shared<CLabel>(pos.w/2, pos.h/2, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE, _text);
+	text = std::make_shared<CLabel>(pos.w/2, pos.h/2, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE, _text, 256);
 	select(index == parent->selected);
 }
 

cmake_modules/VersionDefinition.cmake

@@ -1,6 +1,6 @@
 set(VCMI_VERSION_MAJOR 1)
 set(VCMI_VERSION_MINOR 6)
-set(VCMI_VERSION_PATCH 7)
+set(VCMI_VERSION_PATCH 8)
 add_definitions(
 	-DVCMI_VERSION_MAJOR=${VCMI_VERSION_MAJOR}
 	-DVCMI_VERSION_MINOR=${VCMI_VERSION_MINOR}

debian/changelog

@@ -1,3 +1,9 @@
+vcmi (1.6.8) jammy; urgency=medium
+
+  * New upstream release
+
+ -- Ivan Savenko <[email protected]>  Fri, 25 Apr 2025 12:00:00 +0200
+
 vcmi (1.6.7) jammy; urgency=medium
 
   * New upstream release

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.5/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.5)
 [![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.6/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.6)
 [![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.7/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.7)
+[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.6.8/total)](https://github.com/vcmi/vcmi/releases/tag/1.6.8)
 [![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.

launcher/eu.vcmi.VCMI.metainfo.xml

@@ -90,6 +90,7 @@
 	</screenshots>
 	<launchable type="desktop-id">vcmilauncher.desktop</launchable>
 	<releases>
+		<release version="1.6.8" date="2025-04-25" type="stable"/>
 		<release version="1.6.7" date="2025-02-28" type="stable"/>
 		<release version="1.6.6" date="2025-02-21" type="stable"/>
 		<release version="1.6.5" date="2025-02-03" type="stable"/>

lib/battle/CUnitState.cpp

@@ -698,12 +698,12 @@ BattlePhases::Type CUnitState::battleQueuePhase(int turn) const
 
 bool CUnitState::isHypnotized() const
 {
-	return bonusCache.getBonusValue(UnitBonusValuesProxy::HYPNOTIZED);
+	return bonusCache.hasBonus(UnitBonusValuesProxy::HYPNOTIZED);
 }
 
 bool CUnitState::isInvincible() const
 {
-	return bonusCache.getBonusValue(UnitBonusValuesProxy::INVINCIBLE);
+	return bonusCache.hasBonus(UnitBonusValuesProxy::INVINCIBLE);
 }
 
 int CUnitState::getTotalAttacks(bool ranged) const