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

681 Commits

Author SHA1 Message Date
Laserlicht
0e5711f8bf
Merge branch 'develop' into delete 2024-11-06 23:28:57 +01:00
George King
b5d92e7852
Fixed file encoding 2024-11-04 14:29:50 +01:00
George King
529f6b8a82
Add files via upload 2024-11-03 17:28:45 +01:00
George King
e4f9bcb887
Fixed typo 2024-11-03 14:45: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
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
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
0969871835
Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +02:00
George King
883cc12c94
Updated Czech translation 2024-10-30 23:57:19 +01:00
altiereslima
9dfb6f4233 Update portuguese.json 2024-10-30 19:09:55 -03:00
Ivan Savenko
12d618fe17
Merge pull request #4840 from GeorgeK1ng/develop
Various translation fixes
2024-10-30 14:03:07 +02:00
Ivan Savenko
f8b1f40abb
Merge pull request #4348 from MichalZr6/hill_fort_changes
Hill Fort unavailable upgrade and status bar new messages
2024-10-30 14:00:35 +02:00
Ivan Savenko
c1c9e2e4f0
Merge pull request #4820 from kdmcser/softDenpendency
add support for soft dependencies
2024-10-30 13:31:46 +02:00
Ivan Savenko
e1daf43fb4
Merge pull request #4843 from kdmcser/chinese
update Chinese translation
2024-10-30 13:30:56 +02:00
Ivan Savenko
ea9a59e1f6
Merge pull request #4779 from altiereslima/develop
Update Portuguese Translation
2024-10-30 13:27:15 +02:00
kdmcser
0983a1a32f update Chinese translation 2024-10-29 22:25:56 +08:00
George King
3ab5c12ac3
Fixed missing comma 2024-10-29 13:27:33 +01:00
George King
10f9ebb1e7
Fixed missing comma 2024-10-29 13:26:31 +01:00
George King
d04eee1779
Fix for russian Imp Cahe miss-configuration 2024-10-29 09:51:51 +01:00
George King
490361fd06
Added translation for new strings 2024-10-29 09:06:37 +01:00
Ivan Savenko
a97deea563
Merge pull request #4824 from IvanSavenko/translate_fix
Fixes for issues with translations
2024-10-28 12:56:50 +02:00
Ivan Savenko
db913d95e0
Merge pull request #4808 from Laserlicht/prism_breath
Bonus: prism breath
2024-10-28 12:29:41 +02:00
altiereslima
d557a94951 Update portuguese.json 2024-10-27 16:51:58 -03:00
altiereslima
038067f7e2 Update portuguese.json 2024-10-27 16:45:13 -03:00
altiereslima
8a62d33032 Update portuguese.json 2024-10-27 11:03:00 -03:00
altiereslima
90fd70a3ec Update portuguese.json 2024-10-27 09:59:59 -03:00
Ivan Savenko
939e8b4105 Fix json formatting 2024-10-26 14:21:41 +00:00
Ivan Savenko
d1164ab9a9 Integrated exchange window translation into vcmi 2024-10-26 13:09:09 +00:00
Ivan Savenko
87d841db83 Moved translatable strings to VCMI mod, spaces -> tabs 2024-10-26 12:55:10 +00:00
kdmcser
3b72594743 add support for soft dependencies 2024-10-26 19:15:12 +08:00
Ivan Savenko
c43844706e Implemented translation support for random map descriptions 2024-10-25 20:41:19 +00:00
Laserlicht
53b7c5da6f added MECHANICAL bonus 2024-10-24 21:30:51 +02:00
Ivan Savenko
0c8a529876
Merge pull request #4797 from GeorgeK1ng/develop
Updated Czech translation
2024-10-23 22:20:52 +03:00
George King
ff1053b0a0
Quality fixes 2024-10-21 23:45:10 +02:00
Laserlicht
0991f02282 Bonus: prism breath 2024-10-20 22:02:56 +02:00
George King
28a2fa6790
Quality fixes 2024-10-19 22:43:43 +02:00
George King
681542bd2a
Quality fixes 2024-10-19 22:42:18 +02:00
Maurycy
de0463318c
Update swedish.json
Added new code strings and trimmed down some descriptions so that they will fit in the small description box (hopefully).
2024-10-19 16:16:58 +02:00
George King
7dc74f5585
Small fixes
Fixes for new v1.6 strings
2024-10-18 22:42:23 +02:00
George King
19ad4ee0da
Small fixes
Fixed for new v1.6 strings
2024-10-18 20:56:07 +02:00
altiereslima
538c7ce7b1 Update portuguese.json 2024-10-18 07:24:38 -03:00
altiereslima
3ab3132008 Update portuguese.json 2024-10-17 23:51:57 -03:00
altiereslima
cd107c6b4f
Merge branch 'vcmi:develop' into develop 2024-10-17 23:47:00 -03:00
George King
d42e77b5a7
Updated Czech translation
Small fixes
2024-10-17 18:34:27 +02:00
Ivan Savenko
6dc6cc4cbf
Merge pull request #4786 from GeorgeK1ng/develop
Updated Czech translation
2024-10-17 17:41:30 +03:00
George King
9ef6696e78
Updated Czech translation
Translated 2 overlooked lines
2024-10-16 23:54:41 +02:00