1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-20 03:29:32 +02:00

6838 Commits

Author SHA1 Message Date
Ivan Savenko
7be44278d7
Merge pull request #4892 from SoundSSGood/artifact-related-fixes
Artifact related fixes
2024-11-13 20:58:37 +02:00
Ivan Savenko
46e492be01
Merge pull request #4891 from kdmcser/fix_research_spell_crash
fix spell research crash when no more spells can be researched
2024-11-13 20:50:24 +02:00
Ivan Savenko
1d0fdb1c0e
Merge pull request #4867 from Laserlicht/notFocusedClick
notFocusedClick refactoring
2024-11-13 20:49:31 +02:00
SoundSSGood
27b59dd7ee crash fixed 2024-11-13 06:39:37 +02:00
Laserlicht
719859cc62 optimize 2024-11-12 00:12:56 +01:00
Laserlicht
33220b2eb3 check if used in mainmenu 2024-11-11 23:52:35 +01:00
Laserlicht
6b33f4d969 skip campaigns from set 2024-11-11 22:44:48 +01:00
Laserlicht
9c55ebf2dd chronicles campaign screen 2024-11-11 22:25:54 +01:00
kdmcser
51e742f475 Merge branch 'develop' into fix_research_spell_crash 2024-11-10 23:32:33 +08:00
kdmcser
2621d4f5bf fix spell research crash when no more spells can be researched due to map limit 2024-11-10 23:02:36 +08:00
SoundSSGood
ef46a87e69 ask assemble artifact dialog fix 2024-11-10 16:50:58 +02:00
Laserlicht
23709ab217 support loading layer images 2024-11-09 21:04:20 +01:00
Laserlicht
3872a3ea89 fix fallback scaling 2024-11-09 17:58:23 +01:00
Laserlicht
35e198078b cleanup logic 2024-11-09 14:02:09 +01:00
Laserlicht
ac31a946e6
use path instead of different filename 2024-11-09 13:07:15 +01:00
Laserlicht
1f7cec3ae3
missing prescalefactor 2024-11-08 00:09:17 +01:00
Xilmi
a70f5de8c6 Merge remote-tracking branch 'upstream/develop' into develop 2024-11-07 14:35:13 +01:00
Laserlicht
bcdef11093
rename variable 2024-11-07 02:32:06 +01:00
Laserlicht
0e5711f8bf
Merge branch 'develop' into delete 2024-11-06 23:28:57 +01:00
Ivan Savenko
e9690c8c54
Merge branch 'develop' into autosave_name 2024-11-06 22:06:12 +02:00
Ivan Savenko
2fed53d933
Merge pull request #4865 from Laserlicht/touch_scroll_popup
allow scrolling in touch popups
2024-11-06 22:03:18 +02:00
Ivan Savenko
da8fe13632
Merge pull request #4870 from SoundSSGood/secSkillPlace-fix
CHeroOverview secondary skill icons fixed
2024-11-06 22:02:28 +02:00
Ivan Savenko
92fc66d1c2
Merge pull request #4875 from Laserlicht/patch-3
8th creature fix
2024-11-06 22:02:06 +02:00
Ivan Savenko
e7bea6c3b8
Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization
Remove remaining pointers to VLC entities from serializer
2024-11-06 22:01:11 +02:00
Ivan Savenko
11d9ee310e
Merge pull request #4785 from Laserlicht/subtitles
Subtitles for videos / sync
2024-11-06 21:56:43 +02:00
Laserlicht
7c3afde7ee
fix 2024-11-05 23:12:02 +01:00
SoundSSGood
fa9201831b QuickBackpack window position on shift+click slot fixed 2024-11-04 14:16:06 +02:00
Laserlicht
7a52d1d533
8th creature fix 2024-11-03 22:51:48 +01:00
Laserlicht
52aa4aeb82
fix for not loaded images 2024-11-03 22:17:29 +01:00
Laserlicht
11b437db62 prescaled image support 2024-11-03 20:27:11 +01:00
SoundSSGood
f60813d86f CHeroOverview secondary skill icons fixed 2024-11-03 17:29:27 +02:00
Laserlicht
ca037aae33 notFocusedClick refactoring 2024-11-03 01:13:14 +01:00
Laserlicht
1367348da9 allow scrolling in touch popups 2024-11-02 19:15:49 +01:00
Laserlicht
988d36bd13 sorted 2024-11-02 15:46:20 +01:00
Laserlicht
74b4fbfceb small fix 2024-11-02 15:19:39 +01:00
Laserlicht
0ab4b66026 better approach for scrollbar 2024-11-02 15:16:38 +01:00
Laserlicht
9009dffebd add "other" for bonus display 2024-11-02 14:51:33 +01:00
Laserlicht
17ee363d8d changed bonus source text pos 2024-11-02 14:37:21 +01:00
Laserlicht
5a72a65b31 add labels 2024-11-02 13:59:09 +01:00
Laserlicht
440e9a6575 assign colors for bonuses 2024-11-02 13:05:10 +01:00
Laserlicht
3038e5140a add color frames; remove scrollbar 2024-11-01 19:02:51 +01:00
Laserlicht
b06efa2d13 delete folder 2024-11-01 01:16:01 +01:00
Laserlicht
164aac4db2 refresh list 2024-11-01 00:52:19 +01:00
Laserlicht
38c25cd13e Delete UI 2024-11-01 00:11:55 +01:00
Laserlicht
1f0847660b possibility to delete unsupported saves 2024-10-31 21:57:20 +01:00
Ivan Savenko
0969871835
Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +02:00
Ivan Savenko
e714a02063
Merge pull request #4849 from IvanSavenko/map_encoding
Better handling of encoding detection for maps and campaigns
2024-10-31 15:07:36 +02:00
Xilmi
63097968d3 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-31 12:29:37 +01:00
Laserlicht
452762cd78 change datetime format 2024-10-30 23:23:56 +01:00
Laserlicht
cb91397688 fix pos 2024-10-30 21:50:03 +01:00