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

17823 Commits

Author SHA1 Message Date
kdmcser
5f4a5228ce
Merge branch 'develop' into artifact_sort_fix 2024-11-09 17:34:43 +08:00
kdmcser
8d58066f69 fix artifact sort by slot crash 2024-11-09 17:24:14 +08:00
kdmcser
17dd8ffb48 fix artifact sort by slot crash 2024-11-09 16:54:47 +08:00
Ivan Savenko
a40292e783
Merge pull request #4883 from IvanSavenko/modding_fixes
Fixes for recently reported issues
2024-11-07 15:40:08 +02:00
Ivan Savenko
733b1b339c Remove broken automatic addition of dependency for wog maps 2024-11-07 12:08:28 +00:00
Ivan Savenko
c3c5f73a63 Restore save compatibility with 1.5 2024-11-07 12:08:08 +00:00
Ivan Savenko
b9ff192a91 Fix regressions from previous PR 2024-11-07 12:07:45 +00:00
Ivan Savenko
697d63d2b8 Reworked and fixed gendered hero sprites on adventure map 2024-11-07 10:39:23 +00:00
Ivan Savenko
8cd19f639f Added validation of flaggable objects 2024-11-07 10:39:23 +00:00
Ivan Savenko
d3f6ec5088 Fixed schema to account for lighthouse -> flaggable change 2024-11-07 10:39:23 +00: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
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
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
1367348da9 allow scrolling in touch popups 2024-11-02 19:15:49 +01:00
George King
6ae3ad4615
Add files via upload 2024-11-02 15:39:55 +01:00
George King
6a1e69ae85
Add files via upload 2024-11-02 14:46:52 +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
Ivan Savenko
ee88cfa150 Fix selection of encoding from maps
Fixes typo from previous PR
2024-11-01 13:40:29 +00: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
Ivan Savenko
2205f7c7e0
Merge pull request #4856 from GeorgeK1ng/develop
Updated Czech translation
2024-10-31 16:48:32 +02:00
Ivan Savenko
42dcb21e45
Merge pull request #4819 from Laserlicht/mechanical_bonus
added MECHANICAL bonus
2024-10-31 16:48:23 +02:00
Ivan Savenko
0969871835
Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +02:00
Ivan Savenko
62d0012989
Merge pull request #4851 from IvanSavenko/msvc_upload
Use msvc build for daily Windows builds
2024-10-31 15:08:00 +02:00
Ivan Savenko
11a381ad72
Merge pull request #4853 from Laserlicht/docs
[Docs] fix order
2024-10-31 15:07:53 +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
Ivan Savenko
a9add59355
Merge pull request #4844 from kodobi/bugfix/fix-ballista-damage-range-display
Fix ballista damage range display
2024-10-31 15:07:12 +02:00