1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-04 09:42:40 +02:00
Commit Graph

6387 Commits

Author SHA1 Message Date
Laserlicht
aa6cbdf13b make it also usable on android 2024-08-28 23:07:00 +02:00
Laserlicht
8f24778e9d config for right drag 2024-08-28 22:36:41 +02:00
Laserlicht
be7d27234f map drag with right mouse 2024-08-28 22:17:05 +02:00
Ivan Savenko
4c84379110 Open thieves guild if building provides corresponding bonus 2024-08-28 14:04:47 +00:00
Ivan Savenko
408a632002 Deprecate artifact-related building types 2024-08-28 13:50:08 +00:00
Ivan Savenko
55fd7bd7aa Thieves guild information level is now a bonus type 2024-08-28 13:50:07 +00:00
Ivan Savenko
a1a194d904 Allow replacing war machine if hero has a different machine in the slot 2024-08-28 13:49:42 +00:00
Ivan Savenko
8ef8ffa5c4 Implemented configurable blacksmith. Deprecated ballistaYard type 2024-08-28 13:49:42 +00:00
Ivan Savenko
ce1e0b8875 Moved NewTurn pack generation to NewTurnProcessor 2024-08-28 13:03:24 +00:00
Ivan Savenko
0fd9dbf240 Unified income handling, added IOwnableObject interface 2024-08-28 12:40:44 +00:00
Ivan Savenko
58da447f43
Merge pull request #4523 from IvanSavenko/xbrz_fixes
Xbrz fixes
2024-08-28 15:39:45 +03:00
Ivan Savenko
a2bac260e7 Fix images with custom scaling in xBRZ mode 2024-08-27 19:49:41 +00:00
Ivan Savenko
0bbc2bce33 Fix handling of transparency in xbrz and in images with non-cyan
transparent color in unscaled mode
2024-08-27 19:44:11 +00:00
Laserlicht
d47271de6c avoid zero size Y axis 2024-08-27 21:41:50 +02:00
Ivan Savenko
20d5b33ea6 Remove marketModes as member
marketModes are now generated in runtime and are not a member of
IMarket. Was not a bad change, but towns load buildings before town type
is randomized, leading to case where market modes are not actually known
when building is added to town (like random towns with market built)

Since altar requires CArtifactSet for work, IMarket will now always
contain it, but it will only be accessible if market supports altar
mode.
2024-08-27 14:07:00 +00:00
Ivan Savenko
01396b62b7 Extracted handling of type ID's from serializer into a separate class 2024-08-26 19:48:46 +00:00
Ivan Savenko
232a759db7 Remove type registration from library pack applying 2024-08-26 19:48:46 +00:00
Ivan Savenko
b84af1a6de Significantly simplify packs applying
Apparently our logic for packs applying with types registration is
overcomplicated and by now completely unnecessary - it became redundant
after introduction of visitor pattern.
2024-08-26 19:48:46 +00:00
Ivan Savenko
11e8b04ac5
Merge pull request #4463 from SoundSSGood/IMarket-refactoring
IMarket refactoring
2024-08-26 22:48:23 +03:00
Ivan Savenko
7b746bcaec
Merge pull request #4496 from Laserlicht/statistic_improve
Statistics improve
2024-08-26 19:12:56 +03:00
Ivan Savenko
e65eaf0e06
Merge pull request #4506 from mikeiit/add_missisng_stack_artifact_description
Added missing stack artifact description
2024-08-26 19:10:48 +03:00
Ivan Savenko
3d39963a1c Merge branch 'master' into 'develop' 2024-08-26 14:01:00 +00:00
MichalZr6
2a6525c5ef Check battleInt->curInt instead of battleInt 2024-08-25 19:43:21 +00:00
MichalZr6
619b35ab33 Allow dialogs when in battle interface
But also it is not our turn
2024-08-25 19:43:14 +00:00
Laserlicht
2c5a1bcbb4
remove comment out line 2024-08-25 11:48:17 +02:00
Laserlicht
d9d82fc836 add horicaontal grid + fixes 2024-08-25 02:21:24 +02:00
Mike
3671079754 Added artifact description 2024-08-24 16:37:11 -07:00
Laserlicht
95d2fbc9b7 fix grid 2024-08-25 00:43:55 +02:00
Laserlicht
62790e9aad scaling anim have problems -> use other icon 2024-08-25 00:33:36 +02:00
Laserlicht
6e33b86dcb fix days surived 2024-08-24 23:36:01 +02:00
Ivan Savenko
6d8bc9b859
Merge pull request #4500 from MichalZr6/allow_dialogs_when_in_battle
Allow dialogs when in battle interface but not on the players turn
2024-08-24 16:18:20 +03:00
Ivan Savenko
c22820f484
Merge pull request #4484 from Laserlicht/text_len
campaign text length
2024-08-24 16:06:31 +03:00
Ivan Savenko
3e605253db
Merge pull request #4481 from Laserlicht/fix_hota
fix for 8th creature
2024-08-24 16:06:12 +03:00
SoundSSGood
4035ab1550 added CMarketWindow::getMarketTitle() 2024-08-24 13:52:54 +03:00
MichalZr6
9daabd0710 Check battleInt->curInt instead of battleInt 2024-08-23 23:30:50 +02:00
MichalZr6
d0e0ab767c Allow dialogs when in battle interface
But also it is not our turn
2024-08-23 18:03:58 +02:00
Ivan Savenko
45558552d6 Merge 'vcmi/beta' into beta_fix 2024-08-23 13:18:09 +00:00
Laserlicht
463d18b92d add grid for weeks/months 2024-08-23 00:46:46 +02:00
Laserlicht
d7ee268c76 touch hovering improvements 2024-08-22 23:27:21 +02:00
Ivan Savenko
b6cc409772 Fix excessive removal of dialogs, e.g. new week or timed events 2024-08-22 16:39:30 +00:00
Laserlicht
45fd13bdcd
mapname len 2024-08-21 22:11:16 +02:00
Laserlicht
61af23d258
text length 2024-08-21 21:43:54 +02:00
Laserlicht
43fc741a15 cleaner 2024-08-21 21:24:06 +02:00
Laserlicht
c36a6427c2 fix 2024-08-21 20:27:39 +02:00
Ivan Savenko
475a20124f Fix crash on right-clicking spell component in some dialogs 2024-08-21 18:19:31 +00:00
Ivan Savenko
ff33fbd3a0
Merge pull request #4480 from IvanSavenko/update_prebuilts
Update ffmpeg
2024-08-21 15:57:50 +03:00
Laserlicht
e19194c3b8 fix for 8th creature 2024-08-21 00:17:25 +02:00
SoundSSGood
2e3e6b1553 market->getObjInstanceID() 2024-08-21 01:01:23 +03:00
Ivan Savenko
50a4e3213d Fix ffmpeg deprecation 2024-08-20 19:23:55 +00:00
Laserlicht
0901286f9d
fix 2024-08-20 20:38:38 +02:00