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

343 Commits

Author SHA1 Message Date
Ivan Savenko
877f47e37f
Merge branch 'develop' into video 2024-12-02 13:48:30 +02:00
Ivan Savenko
306ee95496
Merge pull request #4965 from vcmi/sealed_zone
New type of zone - "sealed"
2024-12-02 13:21:02 +02:00
Ivan Savenko
54e2dc4bf8 Fix json in examples 2024-12-01 19:12:07 +00:00
Ivan Savenko
5e57582c47 Replace js -> json5 code blocks 2024-12-01 19:06:50 +00:00
Ivan Savenko
7b682f9010 Always use json5 for syntax highlighting. 2024-12-01 12:18:06 +00:00
Ivan Savenko
36fe8462c5 Address code review, fix few more issues with formatting 2024-12-01 11:15:13 +00:00
Ivan Savenko
74a4a10f48 Added markdownlint to Github CI
- Markdown will now be validated as part of Github CI
- Applied auto-fix to most common issues (mostly whitespace related)
- Fixed manually some of more complex cases

Some valid markdownlint rules are currently disabled, to avoid failing
CI, can be enabled in future
2024-11-30 20:20:15 +00:00
Laserlicht
543185a530 prescale support for video 2024-11-29 23:33:28 +01:00
Tomasz Zieliński
b3b525d282 Better docs 2024-11-25 17:34:13 +01:00
Ivan Savenko
c26db41097
Merge pull request #4979 from kambala-decapitator/ios-docs-image
[docs] add referenced image to the repo
2024-11-25 14:00:58 +02:00
Andrey Filipenkov
538f844398 [docs] add referenced image to the repo 2024-11-24 22:48:25 +03:00
Tomasz Zieliński
9e6cd9b94d Add "special" property for secondary skills 2024-11-23 12:37:30 +01:00
Tomasz Zieliński
6bdb10444f New type of zone - "sealed" 2024-11-23 12:19:25 +01:00
Ivan Savenko
f0a71c9e21
Merge pull request #4935 from IvanSavenko/misc_fixes2
Miscellaneous fixes for reported issues
2024-11-18 13:29:05 +02:00
Ivan Savenko
1699e131db
Merge pull request #4885 from vcmi/macos-install-docs
[docs][macOS] add Homebrew install option
2024-11-18 12:54:53 +02:00
OriginMD
d93ca47afd
[docs][iOS] improve installation manual (#4888)
* Update Installation_iOS.md

* Update_Installation_iOS_2.md

Alternative version of the update

* Update Installation_iOS_2.md

* Update Installation_iOS_2.md

* Update Installation_iOS_3.md

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

* Update docs/players/Installation_iOS.md

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>

---------

Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-11-18 12:54:41 +02:00
Ivan Savenko
be0da8442e Adjust docs 2024-11-18 10:45:43 +00:00
Ivan Savenko
fd1a31253b Improve HD Graphics docs a bit 2024-11-17 19:35:10 +00:00
Ivan Savenko
98a54b61b7
Merge pull request #4874 from Laserlicht/load_prescaled
prescaled image support
2024-11-16 17:28:37 +02:00
Ivan Savenko
90304e5c8a
Merge pull request #4900 from Laserlicht/chronicles_menu
Chronicles menu
2024-11-15 19:15:28 +02:00
Joakim Thorén
e7682cfd5c Add qt5-tools and tbb as required dependencies when using the windows-mingw-release preset 2024-11-14 23:09:29 +01:00
Laserlicht
1e77d08d1a docs for modder 2024-11-13 23:49:57 +01:00
Laserlicht
6199a13603
code review 2024-11-13 20:20:16 +01:00
Laserlicht
e660d30b8a hint 2024-11-11 23:55:07 +01:00
Laserlicht
44561a55db chronicles docs 2024-11-11 22:57:44 +01:00
Andrey Filipenkov
79f57b36f3
add Homebrew install option 2024-11-07 20:54:19 +03:00
Ivan Savenko
11d9ee310e
Merge pull request #4785 from Laserlicht/subtitles
Subtitles for videos / sync
2024-11-06 21:56:43 +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
0969871835
Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +02:00
Laserlicht
3beca1bd79
fix order (docs) 2024-10-30 21:25:20 +01: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
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
Ivan Savenko
565c02d61c Added 'translate missing' command for convenience 2024-10-26 12:54:35 +00:00
kdmcser
3b72594743 add support for soft dependencies 2024-10-26 19:15:12 +08:00
Ivan Savenko
7ae5e2b406 Added support for daily income to flaggable objects 2024-10-25 19:01:00 +00:00
Ivan Savenko
93096dc63c Updated documentation 2024-10-25 18:47:19 +00:00
Laserlicht
53b7c5da6f added MECHANICAL bonus 2024-10-24 21:30:51 +02:00
Laserlicht
0991f02282 Bonus: prism breath 2024-10-20 22:02:56 +02:00
Laserlicht
8b427c3989 use json format 2024-10-16 22:47:38 +02:00
Ivan Savenko
c25aef8f48
Merge pull request #4766 from SoundSSGood/fused-artifacts
Fused artifacts
2024-10-16 15:08:20 +03:00
Ivan Savenko
9a1f26883d Update documentation 2024-10-14 13:05:10 +00:00
SoundSSGood
d4d3ddf685 fused artifacts 2024-10-12 16:43:04 +03:00
Ivan Savenko
c04fb60dc0 Updated docs 2024-10-06 19:44:32 +00:00
Ivan Savenko
f816c3306b
Merge pull request #4694 from Laserlicht/spell_cast_only_self
cast only on self
2024-10-01 17:20:20 +03:00
DjWarmonger
ffed9480e0
Merge pull request #4483 from vcmi/custom_objects_per_zone
Customizable objects in RMG zones
2024-10-01 14:58:35 +02:00
Laserlicht
e6cb87abac cast only on self 2024-09-28 17:32:53 +02:00
Laserlicht
138cbc6a81 scenario name for campaigns 2024-09-24 11:23:10 +02:00
Fabrice TIERCELIN
3e0274fde6 Fix one caption in the source code 2024-09-22 19:37:15 +02:00
Tomasz Zieliński
79c4d7d51f Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone 2024-09-21 14:20:56 +02:00