games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #4266 from IvanSavenko/release_155

Browse Source 
Preparation for release 1.5.5
This commit is contained in:
Ivan Savenko 2024-07-16 19:25:02 +03:00 committed by GitHub
commit ea93da62da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog.md
View File

@ -1,3 +1,13 @@
# 1.5.4 -> 1.5.5
* Fixed crash when advancing to the next scenario in campaigns when the hero not transferring has a combination artefact that can be transferred to the next scenario.
* Fixed game not updating information such as hero path and current music on new day
* Changed default battle queue hotkey from Q to Z to match HD Mod / HotA
* Changed default hotkey for finishing battle with quick combat from E to Z to match HD Mod / HotA
* Creature casting now uses both F and G keyboard hotkeys
* Shift+left click now directly opens the hero window when two heroes are in town
* Fixed handling of alternative actions for creatures that have more than two potential actions, such as move, shoot, and cast spells.
# 1.5.3 -> 1.5.4
### Stability

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

@ -26,8 +26,8 @@ android {
minSdk = qtMinSdkVersion as Integer
targetSdk = qtTargetSdkVersion as Integer // ANDROID_TARGET_SDK_VERSION in the CMake project
versionCode 1540
versionName "1.5.4"
versionCode 1550
versionName "1.5.5"
setProperty("archivesBaseName", "vcmi")
}

2
client/adventureMap/AdventureMapInterface.cpp
View File

@ -444,7 +444,7 @@ void AdventureMapInterface::onPlayerTurnStarted(PlayerColor playerID)
LOCPLINT->localState->setSelection(LOCPLINT->localState->getWanderingHero(0));
}
centerOnObject(LOCPLINT->localState->getCurrentArmy());
onSelectionChanged(LOCPLINT->localState->getCurrentArmy());
//show new day animation and sound on infobar, except for 1st day of the game
if (LOCPLINT->cb->getDate(Date::DAY) != 1)

2
cmake_modules/VersionDefinition.cmake
View File

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

6
config/schemas/objectType.json
View File

@ -40,6 +40,12 @@
"$ref" : "objectTemplate.json"
}
},
"battleground" : {
"description" : "Battleground that will be used for combats in this object. Overrides terrain this object was placed on",
"type" : "string"
},
"sounds" : {
"type" : "object",
"additionalProperties" : false,

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
vcmi (1.5.5) jammy; urgency=medium
* New upstream release
-- Ivan Savenko <saven.ivan@gmail.com> Wed, 17 Jul 2024 12:00:00 +0200
vcmi (1.5.4) jammy; urgency=medium
* New upstream release

2
docs/Readme.md
View File

@ -1,7 +1,7 @@
[![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.5.0/total)](https://github.com/vcmi/vcmi/releases/tag/1.5.0)
[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.5.3/total)](https://github.com/vcmi/vcmi/releases/tag/1.5.3)
[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.5.4/total)](https://github.com/vcmi/vcmi/releases/tag/1.5.4)
[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/1.5.5/total)](https://github.com/vcmi/vcmi/releases/tag/1.5.5)
[![Github Downloads](https://img.shields.io/github/downloads/vcmi/vcmi/total)](https://github.com/vcmi/vcmi/releases)
# VCMI Project

3
docs/modders/Map_Object_Format.md
View File

@ -58,6 +58,9 @@ Full object consists from 3 parts:
// How valuable this object is to AI
"aiValue" : 1000,
// Battleground that will be used for combats in this object. Overrides terrain this object was placed on
"battleground" : "cursed_ground",
// Sounds assigned to this object
"sounds" : {
// Ambient sounds that plays when current hero is near this object

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

@ -90,6 +90,7 @@
</screenshots>
<launchable type="desktop-id">vcmilauncher.desktop</launchable>
<releases>
<release version="1.5.5" date="2024-07-17" type="stable"/>
<release version="1.5.4" date="2024-07-12" type="stable"/>
<release version="1.5.3" date="2024-06-21" type="stable"/>
<release version="1.5.2" date="2024-05-31" type="stable"/>

5
lib/gameState/CGameStateCampaign.cpp
View File

@ -120,6 +120,11 @@ void CGameStateCampaign::trimCrossoverHeroesParameters(const CampaignTravel & tr
if(!info)
return false;
// FIXME: double-check how H3 handles case of transferring components of a combined artifact if entire combined artifact is not transferrable
// For example, what happens if hero has assembled Angelic Alliance, AA is not marked is transferrable, but Sandals can be transferred? Should artifact be disassembled?
if (info->locked)
return false;
// TODO: why would there be nullptr artifacts?
const CArtifactInstance *art = info->artifact;
if(!art)