1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Commit Graph

21029 Commits

Author SHA1 Message Date
Laserlicht
07659e3b25 fix mine handler for rmg 2025-09-29 01:01:54 +02:00
Laserlicht
5ae4db60e3 add mines support 2025-09-28 22:47:41 +02:00
Ivan Savenko
076f7ba5b5 Merge pull request #6182 from Laserlicht/color_list
fixing trimming color in object list
2025-09-28 21:52:19 +03:00
Ivan Savenko
3efeacf332 Merge pull request #6181 from kambala-decapitator/mingw-leftovers
[cmake] remove MinGW Conan leftovers
2025-09-28 21:51:55 +03:00
Ivan Savenko
2ce722f1d9 Merge pull request #6180 from kambala-decapitator/macos-fix-deploy
[macOS] fix deploying package
2025-09-28 21:51:43 +03:00
Ivan Savenko
c469c6c31e Merge pull request #6136 from Laserlicht/resource
Configurable resources
2025-09-28 21:51:10 +03:00
Laserlicht
70328f1bd9 fixing trimming color in object list 2025-09-28 20:40:18 +02:00
Laserlicht
e6def84135 revert handlers 2025-09-28 20:34:48 +02:00
Laserlicht
5da8a7a4dc use resolveidentifier 2025-09-28 19:17:39 +02:00
Ivan Savenko
99462e540b Merge pull request #6150 from Laserlicht/campaignsets
Campaignsets in custom campaign menu
2025-09-28 19:23:07 +03:00
Laserlicht
c9141c183f Merge branch 'develop' into campaignsets 2025-09-28 18:19:44 +02:00
Ivan Savenko
adab720592 Merge pull request #6156 from Laserlicht/butgen
adventure map config button generation
2025-09-28 18:47:20 +03:00
Ivan Savenko
9389d8d2dd Merge pull request #6179 from vcmi/bot/qt-translation-refresh/develop
Auto-update Qt translation files
2025-09-28 18:43:42 +03:00
Ivan Savenko
a05936ae1d Merge pull request #6177 from Laserlicht/fix2
fix list in creature window
2025-09-28 18:41:51 +03:00
Ivan Savenko
66f57bd521 Merge pull request #6105 from GeorgeK1ng/garrison
Use buildin Garrison background
2025-09-28 18:12:09 +03:00
Ivan Savenko
dc8d800c4f Merge pull request #6063 from Opuszek/fix_draw_in_battle
Fixes draw in a battle
2025-09-28 18:11:09 +03:00
Andrey Filipenkov
e0dfa11b21 [cmake] remove MinGW Conan leftovers 2025-09-28 17:23:55 +03:00
Andrey Filipenkov
03c1d3790d [cmake] fail cpack/install if *deployqt tool returns error 2025-09-28 17:16:35 +03:00
Andrey Filipenkov
571f7bd699 [macOS][cmake] also copy Editor dependencies when running macdeployqt
Launcher and Editor can depend on different Qt modules
2025-09-28 17:15:50 +03:00
IvanSavenko
d4516cabc6 Auto-update VCMI Qt translation files 2025-09-28 00:27:08 +00:00
Laserlicht
c795af8490 fix list in creature window 2025-09-27 01:23:20 +02:00
Ivan Savenko
28ce6b3dba Merge pull request #6168 from Laserlicht/kindom_dwelling_fix
fix overdrawn graphics in KindomOverview
2025-09-25 21:42:28 +03:00
Andrey Filipenkov
bed0426684 Merge pull request #6167 from vcmi/kambala-decapitator-patch-2
[docs][conan] text improvements
2025-09-24 14:58:20 +03:00
Andrey Filipenkov
d2d913a44d Merge pull request #6162 from vcmi/kambala-decapitator-patch-1
call windeployqt for all Qt-dependent targets
2025-09-24 14:57:59 +03:00
Andrey Filipenkov
a07ac419a7 [cmake] call windeployqt for all Qt-dependent targets 2025-09-23 21:28:21 +03:00
Laserlicht
f69e9b1b6b fix overdrawn graphics 2025-09-22 19:06:37 +02:00
Andrey Filipenkov
bf859c673e [docs][conan] text improvements 2025-09-22 10:18:45 +03:00
Laserlicht
1ac2dba509 fix 2025-09-21 22:28:41 +02:00
Laserlicht
245782cb68 Merge branch 'resource' of https://github.com/Laserlicht/vcmi into resource 2025-09-21 22:10:18 +02:00
Laserlicht
6c6350ad8b code review 2025-09-21 22:07:57 +02:00
Ivan Savenko
891300d360 Merge pull request #6155 from GeorgeK1ng/future_installer_update
Fix start menu shortcuts creation for PR builds
2025-09-21 21:10:33 +03:00
Ivan Savenko
19c7cf8c98 Merge pull request #6128 from Laserlicht/portrait
fix android portrait mode
2025-09-21 21:09:59 +03:00
Ivan Savenko
3898a33f20 Merge pull request #6104 from MichalZr6/building_upgrades_fix
Log error instead of throw when upgrade is same building ID
2025-09-21 21:09:32 +03:00
Ivan Savenko
6225ce4ec7 Merge pull request #6116 from Laserlicht/shortcuts
shortcut market + boat
2025-09-21 21:09:04 +03:00
Ivan Savenko
7faf0a2fcd Merge pull request #6137 from GeorgeK1ng/patch-1
Updated Czech translation
2025-09-21 20:20:14 +03:00
Ivan Savenko
6c4a61bda4 Merge pull request #6138 from kambala-decapitator/fix-warnings
fix warnings
2025-09-21 20:19:57 +03:00
Ivan Savenko
0b33723a1a Merge pull request #6099 from Laserlicht/kingdom_overview
kingdom overview dwellings for mods
2025-09-21 20:19:17 +03:00
Ivan Savenko
ef4b879776 Merge pull request #6139 from kambala-decapitator/minizip-ng
support using minizip-ng instead of minizip
2025-09-21 20:18:44 +03:00
Ivan Savenko
43f6199d96 Merge pull request #6140 from GeorgeK1ng/auto_ts_update
Fix Qt translation workflow
2025-09-21 20:16:32 +03:00
Ivan Savenko
f88c2f30dd Merge pull request #6157 from heroesiiifan/campedit
fixed regions in campaigneditor
2025-09-21 20:16:04 +03:00
Ivan Savenko
1ccd917632 Merge pull request #6163 from Laserlicht/market_text
fix market text
2025-09-21 20:15:24 +03:00
Laserlicht
759571879e fix text overflow 2025-09-21 18:03:47 +02:00
Laserlicht
341b701a5e fix market text 2025-09-21 17:48:56 +02:00
heroesiiifan
57ac87c038 fixed regions in campaigneditor 2025-09-20 14:48:41 +02:00
Laserlicht
f094cddcb3 fix for adding animationLayouts later (after init) 2025-09-19 21:23:52 +02:00
Laserlicht
0e7a067a34 fix naming 2025-09-19 15:23:00 +02:00
Laserlicht
a4b09f8310 correctly register them 2025-09-19 14:48:17 +02:00
Laserlicht
6320fd8ab0 generate button from icon in config (big & small) 2025-09-19 14:35:11 +02:00
George King
b6b9852363 Update installer.iss 2025-09-19 13:16:56 +02:00
George King
78cc7cd8e8 Fix start menu shortcuts creation for PR builds 2025-09-19 13:14:59 +02:00