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

704 Commits

Author SHA1 Message Date
Ivan Savenko
5461a67ceb
Merge pull request #4953 from kdmcser/chinese
update Chinese translation
2024-11-22 18:30:41 +02:00
Ivan Savenko
32afd08f2b
Update Mods/vcmi/config/swedish.json 2024-11-22 17:29:32 +02:00
kdmcser
a10a305df8 update Chinese translation 2024-11-22 02:14:52 +08:00
kdmcser
fdd2290366 update Chinese translation 2024-11-22 01:24:50 +08:00
Maurycy
e00c2b0c6d
Update swedish.json 2024-11-21 16:04:14 +01:00
Ivan Savenko
53349cc19e
Merge pull request #4924 from Laserlicht/ger_update
update german
2024-11-18 12:57:18 +02:00
Ivan Savenko
b64dbf19d4
Merge pull request #4913 from ToRRent1812/patch-3
Update polish.json
2024-11-18 12:55:34 +02:00
Łukasz Zając
51490f8f85
fit text into the box 2024-11-16 23:57:32 +01:00
Laserlicht
f28502c981 update german 2024-11-16 22:53:12 +01:00
Łukasz Zając
d862351ad6
Pryzmatyczny 2024-11-16 21:08:51 +01:00
Ivan Savenko
c3b63a1bef
Merge pull request #4857 from Laserlicht/delete
Delete saves / random maps
2024-11-16 17:28:23 +02:00
Łukasz Zając
fccf3132a8
Update polish.json
added new strings.
2024-11-15 23:27:10 +01:00
Ivan Savenko
df0c53af41
Merge pull request #4864 from Laserlicht/creature_window_rework
Creature window rework
2024-11-15 19:13:58 +02:00
Laserlicht
0f94f35dcf
code review 2024-11-14 00:34:39 +01:00
kdmcser
306c84572a update Chinese translation 2024-11-11 21:03:25 +08: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
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
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
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
3038e5140a add color frames; remove scrollbar 2024-11-01 19:02:51 +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