1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

18583 Commits

Author SHA1 Message Date
Laserlicht
0e5711f8bf
Merge branch 'develop' into delete 2024-11-06 23:28:57 +01:00
Ivan Savenko
22ee5110a3
Merge pull request #4854 from Laserlicht/autosave_name
Autosave name
2024-11-06 23:19:35 +02: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
2da2fc48e2
Merge pull request #4861 from GeorgeK1ng/develop
Updated Czech translation + Shrine spell readability fix
2024-11-06 22:02:57 +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
fa0b911be7
Merge pull request #4877 from Laserlicht/chr_fix
fix chronicles
2024-11-06 22:01:53 +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
a2c2b28dfe
Merge pull request #4859 from IvanSavenko/map_encoding_fix
Fix selection of encoding from maps
2024-11-06 22:00:59 +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
Laserlicht
10da13729c
fix boost 2024-11-05 02:00:26 +01:00
Laserlicht
42059d18c3 fix chronicles 2024-11-04 23:30:56 +01:00
George King
498f78de87
Add files via upload 2024-11-04 16:39:22 +01:00
George King
b5d92e7852
Fixed file encoding 2024-11-04 14:29:50 +01:00
George King
3150376b36
Improve Shrine spell readability 2024-11-04 14:07:51 +01:00
George King
8b15c9744d
Improve Shrine spell readability 2024-11-04 14:07:13 +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
George King
529f6b8a82
Add files via upload 2024-11-03 17:28:45 +01:00
SoundSSGood
f60813d86f CHeroOverview secondary skill icons fixed 2024-11-03 17:29:27 +02:00
George King
e4f9bcb887
Fixed typo 2024-11-03 14:45:49 +01: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
George King
6ae3ad4615
Add files via upload 2024-11-02 15:39:55 +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
George King
6a1e69ae85
Add files via upload 2024-11-02 14:46:52 +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
George King
5f02ede31a
Updated Czech translation 2024-11-02 10:58:06 +01:00
George King
8d70c48f00
Updated Czech translation 2024-11-02 10:54:43 +01:00
George King
63e6c98d81
Updated Czech translation 2024-11-02 10:54:06 +01:00
George King
e95d375a02
Updated Czech translation 2024-11-02 10:53:36 +01:00
Laserlicht
3038e5140a add color frames; remove scrollbar 2024-11-01 19:02:51 +01:00
Ivan Savenko
ee88cfa150 Fix selection of encoding from maps
Fixes typo from previous PR
2024-11-01 13:40:29 +00: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
e45be3c5e6
Merge pull request #4850 from IvanSavenko/object_descriptions
Implemented optional descriptions for market map objects
2024-10-31 16:58:14 +02:00
Ivan Savenko
44ee6cc573
Merge pull request #4847 from IvanSavenko/isolate_configs
Always load json configs from mod that references it
2024-10-31 16:49:24 +02:00
Ivan Savenko
6056d385ed Always load json configs from mod that references it
This should fix rather common problem with mods, where two unrelated mods
accidentally use same file name for a config file, leading to very unclear
conflict since this result in a file override.

Now all config files referenced in mod.json are loaded specifically from
filesystem of mod that referenced it. In other words, it is no longer
possible for one mod to override config from another mod.

As a side effect, this allows mods to use shorter directory layout, e.g.
`config/modName/xxx.json` can now be safely replaced with `config/
xxx.json` without fear of broken mod if there is another mod with same
path to config. Similarly, now all mods can use `config/translation/
language.json` scheme for translation files

Since this is no longer a problem, I've also simplified directory layout
of our built-in 'vcmi' mod, by moving all files from `config/vcmi`
directory directly to `config` directory.

- Overrides for miscellaneous configs like mainmenu.json should works as
before
- Images / animations (png's or def's) work as before (and may still
result in confict)
- Rebalance mods work as before and can modify another mod via standard
`modName:objectName` syntax
2024-10-31 14:49:11 +00:00
Ivan Savenko
a014023358
Merge pull request #4855 from altiereslima/develop
Update Portuguese Translation
2024-10-31 16:48:39 +02:00