games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

Merge master -> develop

Browse Source
This commit is contained in:
Ivan Savenko 2023-02-03 13:26:44 +02:00
commit 9c59025db0
5 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ChangeLog.md
View File

@ -1,3 +1,35 @@
# 1.1.0 -> 1.1.1
### GENERAL:
* Fixed missing sound in Polish version from gog.com
* Fixed positioning of main menu buttons in localized versions of H3
* Fixed crash on transferring artifact to commander
* Fixed game freeze on receiving multiple artifact assembly dialogs after combat
* Fixed potential game freeze on end of music playback
* macOS/iOS: fixed sound glitches
* Android: upgraded version of SDL library
* Android: reworked right click gesture and relative pointer mode
* Improved map loading speed
* Ubuntu PPA: game will no longer crash on assertion failure
### ADVENTURE MAP:
* Fixed hero movement lag in single-player games
* Fixed number of drowned troops on visiting Sirens to match H3
* iOS: pinch gesture visits current object (Spacebar behavior) instead of activating in-game console
### TOWNS:
* Fixed displaying growth bonus from Statue of Legion
* Growth bonus tooltip ordering now matches H3
* Buy All Units dialog will now buy units starting from the highest level
### LAUNCHER:
* Local mods can be disabled or uninstalled
* Fixed styling of Launcher interface
### MAP EDITOR:
* Fixed saving of roads and rivers
* Fixed placement of heroes on map
# 1.0.0 -> 1.1.0
### GENERAL:

2
cmake_modules/VersionDefinition.cmake
View File

@ -10,4 +10,4 @@ add_definitions(
set(APP_SHORT_VERSION "${VCMI_VERSION_MAJOR}.${VCMI_VERSION_MINOR}")
if(NOT VCMI_VERSION_PATCH EQUAL 0)
string(APPEND APP_SHORT_VERSION ".${VCMI_VERSION_PATCH}")
endif()
endif()

8
debian/changelog vendored
View File

@ -2,8 +2,14 @@ vcmi (1.2.0) jammy; urgency=medium
* New upstream release
-- Ivan Savenko <saven.ivan@gmail.com> Fri, 23 Dec 2022 16:00:00 +0200
-- Ivan Savenko <saven.ivan@gmail.com> Sat, 04 Feb 2023 16:00:00 +0200
vcmi (1.1.1) jammy; urgency=medium
* New upstream release
-- Ivan Savenko <saven.ivan@gmail.com> Fri, 03 Feb 2023 12:00:00 +0200
vcmi (1.1.0) jammy; urgency=medium
* New upstream release

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

@ -38,7 +38,8 @@
<url type="bugtracker">https://github.com/vcmi/vcmi/issues</url>
<url type="faq">https://vcmi.eu/faq/</url>
<releases>
<release version="1.2.0" date="2022-12-24" type="development" />
<release version="1.2.0" date="2023-02-04" type="development" />
<release version="1.1.1" date="2023-02-03" />
<release version="1.1.0" date="2022-12-23" />
<release version="1.0.0" date="2022-09-11" />
<release version="0.99" date="2016-11-01" />

7
mapeditor/inspector/inspector.cpp
View File

@ -110,7 +110,8 @@ void Initializer::initialize(CGLighthouse * o)
void Initializer::initialize(CGHeroInstance * o)
{
if(!o) return;
if(!o)
return;
o->tempOwner = defaultPlayer;
if(o->ID == Obj::PRISON)
@ -120,9 +121,9 @@ void Initializer::initialize(CGHeroInstance * o)
{
for(auto t : VLC->heroh->objects)
{
if(t->heroClass == VLC->heroh->classes.objects[o->subID].get())
if(t->heroClass->getId() == HeroClassID(o->subID))
{
o->type = VLC->heroh->objects[o->subID];
o->type = t;
break;
}
}