1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-08 22:26:51 +02:00
Commit Graph

18359 Commits

Author SHA1 Message Date
e4f9bcb887 Fixed typo 2024-11-03 14:45:49 +01:00
ca037aae33 notFocusedClick refactoring 2024-11-03 01:13:14 +01:00
1367348da9 allow scrolling in touch popups 2024-11-02 19:15:49 +01:00
988d36bd13 sorted 2024-11-02 15:46:20 +01:00
6ae3ad4615 Add files via upload 2024-11-02 15:39:55 +01:00
74b4fbfceb small fix 2024-11-02 15:19:39 +01:00
0ab4b66026 better approach for scrollbar 2024-11-02 15:16:38 +01:00
9009dffebd add "other" for bonus display 2024-11-02 14:51:33 +01:00
6a1e69ae85 Add files via upload 2024-11-02 14:46:52 +01:00
17ee363d8d changed bonus source text pos 2024-11-02 14:37:21 +01:00
5a72a65b31 add labels 2024-11-02 13:59:09 +01:00
440e9a6575 assign colors for bonuses 2024-11-02 13:05:10 +01:00
5f02ede31a Updated Czech translation 2024-11-02 10:58:06 +01:00
8d70c48f00 Updated Czech translation 2024-11-02 10:54:43 +01:00
63e6c98d81 Updated Czech translation 2024-11-02 10:54:06 +01:00
e95d375a02 Updated Czech translation 2024-11-02 10:53:36 +01:00
3038e5140a add color frames; remove scrollbar 2024-11-01 19:02:51 +01:00
ee88cfa150 Fix selection of encoding from maps
Fixes typo from previous PR
2024-11-01 13:40:29 +00:00
b06efa2d13 delete folder 2024-11-01 01:16:01 +01:00
164aac4db2 refresh list 2024-11-01 00:52:19 +01:00
38c25cd13e Delete UI 2024-11-01 00:11:55 +01:00
1f0847660b possibility to delete unsupported saves 2024-10-31 21:57:20 +01:00
e45be3c5e6 Merge pull request #4850 from IvanSavenko/object_descriptions
Implemented optional descriptions for market map objects
2024-10-31 16:58:14 +02:00
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
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
a014023358 Merge pull request #4855 from altiereslima/develop
Update Portuguese Translation
2024-10-31 16:48:39 +02:00
2205f7c7e0 Merge pull request #4856 from GeorgeK1ng/develop
Updated Czech translation
2024-10-31 16:48:32 +02:00
42dcb21e45 Merge pull request #4819 from Laserlicht/mechanical_bonus
added MECHANICAL bonus
2024-10-31 16:48:23 +02:00
0969871835 Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +02:00
62d0012989 Merge pull request #4851 from IvanSavenko/msvc_upload
Use msvc build for daily Windows builds
2024-10-31 15:08:00 +02:00
11a381ad72 Merge pull request #4853 from Laserlicht/docs
[Docs] fix order
2024-10-31 15:07:53 +02:00
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
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
63097968d3 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-31 12:29:37 +01:00
5979f53a26 Upgrade priority
New priority to upgrade existing armies to make it less likely to fight the AI with only part of its army.
2024-10-31 00:42:33 +01:00
9d2fc1b1c9 Update DefenceBehavior.cpp
Fixed an issue that caused the AI to try buying the same hero in two different towns.
2024-10-31 00:41:51 +01:00
883cc12c94 Updated Czech translation 2024-10-30 23:57:19 +01:00
452762cd78 change datetime format 2024-10-30 23:23:56 +01:00
9dfb6f4233 Update portuguese.json 2024-10-30 19:09:55 -03:00
cb91397688 fix pos 2024-10-30 21:50:03 +01:00
1423951b9e disable selection by empty slot 2024-10-30 21:36:37 +01:00
3beca1bd79 fix order (docs) 2024-10-30 21:25:20 +01:00
a54f4e1bd1 change autosave folder name; align autosave folder 2024-10-30 21:18:55 +01:00
09e2d1a59a Merge pull request #4842 from Olegmods/develop
Fixed some configs
2024-10-30 21:24:05 +02:00
2678665f67 Resolve merge conflict 2024-10-30 18:48:09 +01:00
44f479be89 Merge branch 'vcmi:develop' into bugfix/fix-ballista-damage-range-display 2024-10-30 18:41:29 +01:00
0a0692061d Merge branch 'bugfix/fix-ballista-damage-range-display' of https://github.com/kodobi/vcmi into bugfix/fix-ballista-damage-range-display 2024-10-30 18:39:11 +01:00
b82444ba43 Fix ballista damage range display
- Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3.
- Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.
2024-10-30 18:35:35 +01:00
d39dad6cb4 Fix build 2024-10-30 17:03:48 +00:00
a39469d165 Add save compatibility 2024-10-30 16:57:03 +00:00