1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

10723 Commits

Author SHA1 Message Date
Ivan Savenko
3ae4819fcb
Merge pull request #2085 from Nordsoft91/mapeditor-fix
[1.2.1] Fix portrait serialization
2023-04-28 17:06:29 +03:00
nordsoft
f6d91cab35 Fix portrait serialization
# Conflicts:
#	lib/mapObjects/CGHeroInstance.cpp
2023-04-28 05:34:59 +04:00
Ivan Savenko
9296306fa3
Merge pull request #2041 from IvanSavenko/bugfixing_for_hotfix
Fixes for 1.2.1
2023-04-24 18:13:00 +03:00
Ivan Savenko
3ac713d6a8 Fix crash on dereferencing nullptr 2023-04-24 17:17:12 +03:00
Ivan Savenko
d3c1c92a03 Do not update minimap using puzzle map data 2023-04-24 17:16:55 +03:00
Ivan Savenko
fa156568c4 Fixes according to review 2023-04-24 16:58:15 +03:00
Andrii Danylchenko
f2506dd196 Fix hero count calculation for resourceful ai mod 2023-04-24 16:57:31 +03:00
Andrii Danylchenko
d2530f66bf #2018 - fix shipyard usage for NKAI, allied shipyard should work now 2023-04-24 16:56:07 +03:00
Andrii Danylchenko
eff158a9a8 Fix killing hero with grail 2023-04-23 16:17:27 +03:00
Ivan Savenko
24c6587072 Fixed crash on leaving to main menu from battle in hotseat mode 2023-04-20 19:56:35 +03:00
Ivan Savenko
f245080cba Fix missing error message on casting spell in hotseat 2023-04-20 19:24:13 +03:00
Ivan Savenko
6df85be4b3 Fixed death animation of Efreeti killed by petrification attack 2023-04-20 18:13:01 +03:00
Ivan Savenko
5c9ae8aafc Implemented spell range overlay for Dimension Door and Scuttle Boat 2023-04-20 14:15:08 +03:00
Ivan Savenko
4dc16b9ff7 Adventure map spells are no longer visible on units in battle 2023-04-20 13:16:45 +03:00
Ivan Savenko
9882c37ce3 Good morale can no longer happen after battle is over 2023-04-20 13:10:03 +03:00
Ivan Savenko
d9939f0918 Bad morale can no longer happen after waiting 2023-04-20 13:08:55 +03:00
Necr0o0
bfed62d3a2 Fixed #2022 storing event in map editor
Fixing issue "Event message isn't stored #2022" by adding message in Pandora setProperty ( cause CGEvent inherits CGPandoraBox)
2023-04-20 12:30:44 +03:00
Ivan Savenko
b3207f3465 RMG tab will now show all templates but will block invalid map sizes 2023-04-19 23:14:23 +03:00
Ivan Savenko
b517adfb25 Fixed crash on empty save game list after filtering 2023-04-19 23:12:30 +03:00
Ivan Savenko
3d30e04184 Fixed centering of scenario information window 2023-04-19 23:11:44 +03:00
Ivan Savenko
5a5aced67e Fixed empty Black Market on game start 2023-04-19 23:11:17 +03:00
Ivan Savenko
01af231084 Fixed Json conversion on Qt6 2023-04-19 23:10:34 +03:00
Ivan Savenko
f593c2cf6e Fixed handling of utf-8 in code on msvc 2023-04-19 23:08:21 +03:00
Ivan Savenko
16bed465b6 Bump to versions 1.2.1 2023-04-19 23:08:00 +03:00
Ivan Savenko
505a78a638
Merge pull request #2035 from rilian-la-te/native-fix-beta
vcmi: fix terrain penalties
2023-04-19 13:39:54 +03:00
Konstantin P
d94ce22e70 vcmi: fix terrain penalties
Fixes #2028
2023-04-19 12:41:54 +03:00
Ivan Savenko
d55b7b2d10
Merge pull request #2002 from IvanSavenko/fix_launcher
Fix Launcher issues discovered in 1.2
2023-04-18 15:43:26 +03:00
Ivan Savenko
f9173b556b Do not block setup if language detection failed 2023-04-15 20:04:00 +03:00
Ivan Savenko
49538b6e2d Handle case of user selecting "Data" folder of H3 install
After all, we do ask user to select location of Heroes III data...
2023-04-15 20:02:59 +03:00
Ivan Savenko
7c6247f499 Be less strict in detecting languages to catch different versions of H3 2023-04-15 20:02:10 +03:00
Andrii Danylchenko
1ec975852f
Merge pull request #1994 from vcmi/android-release
Android: building aab for release
2023-04-15 19:57:21 +03:00
Andrii Danylchenko
4d34c83c0b Android: building aab for release 2023-04-15 11:49:50 +03:00
Ivan Savenko
c125e040c3
Merge pull request #1977 from vcmi/beta
Merge 1.2 release into master branch
2023-04-14 15:31:09 +03:00
Ivan Savenko
c24a60dce6
Merge pull request #1980 from IvanSavenko/debian_update
Updated Linux release date
2023-04-14 14:58:16 +03:00
Ivan Savenko
4a2c7e9bdf Updated Linux release date 2023-04-14 14:51:26 +03:00
Ivan Savenko
7f04ce7b9d
Merge pull request #1895 from IvanSavenko/changelog_update
Final changelog update for 1.2 release
2023-04-14 14:20:17 +03:00
Ivan Savenko
93af4ef557 Updated to latest beta 2023-04-14 14:18:53 +03:00
Ivan Savenko
c7c2b25b6a
Merge pull request #1979 from IvanSavenko/fix_multiple_mods_install
Fix installation of multiple mods at once, e.g. during setup
2023-04-14 14:12:23 +03:00
Ivan Savenko
a9aa751ba0 Fix installation of multiple mods at once, e.g. during setup 2023-04-14 12:47:13 +03:00
Ivan Savenko
5dd1d5bf3f
Merge pull request #1973 from IvanSavenko/beta_fixes
Fixes for 1.2 release
2023-04-14 11:41:22 +03:00
Ivan Savenko
e97c2bd838
Merge pull request #1970 from IvanSavenko/add_rmg_templates
Moved RMG templates from vcmi-extras to vcmi mod
2023-04-14 11:40:27 +03:00
DjWarmonger
2cac8fb419
Merge pull request #1946 from vcmi/mines_after_monoliths
Monoliths and Subterranean Gates placement tweaks
2023-04-14 08:15:09 +02:00
Ivan Savenko
c2a0cf4cf3 Extended some templates to support larger maps (G+U / H+U) 2023-04-14 00:24:13 +03:00
Ivan Savenko
9d31830c74 Fix check for Demon Summon targets 2023-04-13 21:17:35 +03:00
Ivan Savenko
1978e6f8e8 Do not show unit information on dead creatures 2023-04-13 21:16:55 +03:00
Ivan Savenko
1fab2e2e34 Do not allow rising of corpses below alive stack 2023-04-13 19:08:08 +03:00
Ivan Savenko
beb9069f78 Do not allow targeting enemy corpses for Demon summon 2023-04-13 19:07:46 +03:00
Ivan Savenko
ccb08bda6f Fix loading of "true fullscreen" option in launcher 2023-04-13 19:07:21 +03:00
Ivan Savenko
35ac4d88ac Fix Seer Hut right-click text 2023-04-13 19:06:44 +03:00
Ivan Savenko
9d901efb0c Change default difficulty to "Normal" 2023-04-13 19:06:17 +03:00