Browse Source

Merge branch 'vcmi/master' into 'vcmi/develop'

Ivan Savenko 5 tháng trước cách đây
mục cha
commit
0b126ebc8b

+ 22 - 1
ChangeLog.md

@@ -1,6 +1,6 @@
 # VCMI Project Changelog
 
-## 1.6.7 -> 1.7.0
+## 1.6.8 -> 1.7.0
 
 * Added support for configuring icons for bonus icons in creature window per bonus subtype or per bonus value
 * Heroes that are marked as unavailable for specific player will now be correctly blocked from use as starting heroes
@@ -8,6 +8,27 @@
 * Added BASE_TILE_MOVEMENT_COST bonus that allows configuring minimal cost for moving between tiles for heroes
 * Commanders will now automatically gain no melee penalty bonus on receiving ranged attack
 
+## 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

+ 2 - 2
client/adventureMap/AdventureMapInterface.cpp

@@ -775,8 +775,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)

+ 6 - 0
debian/changelog

@@ -4,6 +4,12 @@ vcmi (1.7.0) jammy; urgency=medium
 
  -- Ivan Savenko <[email protected]>  Fri, 30 May 2025 12:00:00 +0200
 
+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

+ 1 - 1
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.

+ 1 - 0
launcher/eu.vcmi.VCMI.metainfo.xml

@@ -91,6 +91,7 @@
 	<launchable type="desktop-id">vcmilauncher.desktop</launchable>
 	<releases>
 		<release version="1.7.0" date="2025-05-30" type="development"/>
+		<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"/>