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

7668 Commits

Author SHA1 Message Date
Laserlicht
5a650a8f2f Merge branch 'develop' into battleonly 2025-10-24 01:01:42 +02:00
Laserlicht
15a85c2c5c fix pos in list popup 2025-10-24 00:56:20 +02:00
Laserlicht
ed562e42ba battleonly gui 2025-10-24 00:56:20 +02:00
Laserlicht
104fb5b308 generate blue town portal background 2025-10-24 00:54:22 +02:00
Laserlicht
4d37fe631b battle only basic implementation 2025-10-24 00:54:22 +02:00
Laserlicht
2bee582cc7 fix 2025-10-21 22:40:46 +02:00
Laserlicht
7a7ba74907 review 2025-10-21 22:30:32 +02:00
Michał Zaremba
f2755d6089 Fix crash on calling translate command 2025-10-20 10:01:09 +02:00
Ivan Savenko
7db19825f9 Merge pull request #6222 from Laserlicht/showincome
Show daily income in popup
2025-10-19 08:35:58 +03:00
Ivan Savenko
efa4be1b98 Merge pull request #6223 from Laserlicht/popup_coloor
Colorize opponent hero / castle / garison details frame
2025-10-19 08:35:06 +03:00
Michał Zaremba
30c58f0ffa Fix trimTextIfTooWide function 2025-10-17 20:50:47 +02:00
Laserlicht
5a64fbd89c show invisible 2025-10-12 16:26:44 +02:00
Laserlicht
4b35c82854 color popup window 2025-10-12 01:53:37 +02:00
Laserlicht
bc1ba60ea5 place in new line 2025-10-11 22:07:32 +02:00
Laserlicht
850617afb0 show income 2025-10-11 22:01:40 +02:00
Ivan Savenko
e81d5bc973 Merge pull request #6158 from Laserlicht/gen_res_assets
generate market windows for 8/9 resources
2025-10-11 19:09:57 +03:00
Laserlicht
768b233813 fix 2025-10-09 00:01:00 +02:00
Laserlicht
64c44ce887 template search 2025-10-08 01:12:57 +02:00
Ivan Savenko
da9ba62110 Merge pull request #6209 from Laserlicht/kingdomoverview_res
Kingdomoverview additional mines
2025-10-07 11:47:44 +03:00
Laserlicht
0fad70cac7 puzzlemap fine tuning 2025-10-05 20:31:48 +02:00
Laserlicht
6c1748e0d6 fix allied towns & color text input 2025-10-05 14:24:29 +02:00
Ivan Savenko
19ff1a224c Merge pull request #6193 from MichalZr6/mod_incompability_errors
Rework handling some errors and uncought exceptions
2025-10-05 12:15:17 +03:00
Laserlicht
3e2a526140 correct update 2025-10-05 03:18:47 +02:00
Laserlicht
120213509d netpacks for renaming 2025-10-05 02:46:19 +02:00
Laserlicht
115d90cbb3 small refactoring 2025-10-05 02:03:18 +02:00
Laserlicht
e6272fe477 fix length 2025-10-05 01:57:01 +02:00
Laserlicht
f5d1657041 make town title editable 2025-10-05 01:49:00 +02:00
Laserlicht
7c74f34ddc fix 2025-10-04 17:43:37 +02:00
Laserlicht
46619f35fe load mine image in kingdom overview 2025-10-04 17:14:24 +02:00
Laserlicht
81f713a2b0 add slider for new mines 2025-10-04 16:21:07 +02:00
Laserlicht
7cf771d4f7 Merge branch 'vcmi:develop' into gen_res_assets 2025-10-04 14:12:29 +02:00
Ivan Savenko
da79b27547 Merge pull request #6164 from Laserlicht/resbar
Resourcebar in adventuremap
2025-10-04 15:01:56 +03:00
Ivan Savenko
8ad9b1d526 Merge pull request #6184 from Laserlicht/mines
Mines configurable
2025-10-04 14:59:59 +03:00
Ivan Savenko
833541f55f Merge pull request #6206 from Laserlicht/lobby_button
allow global lobby as button
2025-10-04 14:59:10 +03:00
Ivan Savenko
493e9f0f93 Merge pull request #6198 from Laserlicht/bonus_text
fix bonus text pos
2025-10-04 14:58:12 +03:00
Ivan Savenko
7a158fb4dc Merge pull request #6203 from Laserlicht/async_fix
fix incorrect button color with async upscaling
2025-10-04 14:58:02 +03:00
Laserlicht
01ef04a4b2 allow global lobby as button 2025-10-04 13:12:18 +02:00
Laserlicht
5973c6cca3 fix inncorect button color with async upscaling 2025-10-03 15:49:45 +02:00
Ivan Savenko
1c819edc32 Merge pull request #6197 from Laserlicht/drag_impr
left mouse drag on advmap improvement
2025-10-03 14:53:27 +03:00
Ivan Savenko
5ae40f5d3e Merge pull request #6202 from Laserlicht/resize_battle_window
resizable battle window
2025-10-03 14:53:02 +03:00
Laserlicht
9cfe9e931c resizable battle window 2025-10-03 03:41:59 +02:00
Laserlicht
fc00774277 fix button condition 2025-10-02 21:55:52 +02:00
Laserlicht
2697f98d9f left mouse drag on advmap improvement 2025-10-02 21:55:29 +02:00
Laserlicht
c8b0bfd9f9 fix bonus text pos 2025-10-02 21:30:57 +02:00
Michał Zaremba
ea261ae48f Rework handling some errors and uncought exceptions 2025-10-01 11:00:56 +02:00
Laserlicht
21bc568e59 moddable amount for mines 2025-09-29 02:00:04 +02:00
Laserlicht
7314bb2d06 remove todo 2025-09-29 01:15:04 +02:00
Laserlicht
5ae4db60e3 add mines support 2025-09-28 22:47:41 +02:00
Laserlicht
d921a5c528 make sonar happy 2025-09-28 22:20:00 +02:00
Laserlicht
e4cd9895be make sonar happy 2025-09-28 22:16:21 +02:00