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

191 Commits

Author SHA1 Message Date
Ivan Savenko
53d4afdae5 Enable rule to enforce specifying language for code blocks 2024-12-05 21:32:55 +00:00
Ivan Savenko
879aaba980 Use json instead of json5 for syntax highlight in docs
Looks like website only recognizes javascript & json, and is not aware
of jsonc or json5.

Will result in small regression on Github web view - comments will show
up as red (since comments are not part of json format), but syntax
highlight would work both on website and on Github.

Alternative is using javascript for syntax highlight, however syntax
highlighter for json looks better on both website and Github (since it
uses separate highlighting for json keys, separate from strings in
values)
2024-12-04 16:50:01 +00:00
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
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
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
Laserlicht
1e77d08d1a docs for modder 2024-11-13 23:49:57 +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
0969871835
Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +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
db913d95e0
Merge pull request #4808 from Laserlicht/prism_breath
Bonus: prism breath
2024-10-28 12:29:41 +02: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
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
Ivan Savenko
cb96b9959e
Merge pull request #4623 from Laserlicht/invincible_bonus
INVINCIBLE bonus
2024-09-20 11:50:29 +03:00
Laserlicht
5e3630adae adjust texts 2024-09-19 20:57:43 +02:00
Ivan Savenko
65355925e9
Merge pull request #4595 from Laserlicht/cast_without_skip
Bonus for spell: cast without skip the turn
2024-09-19 16:17:48 +03:00
Laserlicht
b36c05df1d INVINCIBLE bonus 2024-09-19 03:14:45 +02:00
Ivan Savenko
d0ac6458b9
Merge pull request #4609 from IvanSavenko/building_fixes
Building fixes
2024-09-17 17:50:49 +03:00
Ivan Savenko
7c495ee1dd Add new translation file to CMakeLists.txt. Update docs. 2024-09-16 16:59:04 +00:00
Ivan Savenko
1d7a89c79b Only visiting heroes can now activate manual rewardable buildings
- This is more clear - in case if building generates queries
- Avoids some edge cases, like what to do if building is single-use and
town has 2 heroes
- In line with hota version of this feature
2024-09-15 10:36:31 +00:00
Laserlicht
0aaafc4c8a cast without skip 2024-09-14 15:10:24 +02:00
Tomasz Zieliński
54e47c20b0 Add docs for new options 2024-09-14 13:20:24 +02:00
Ivan Savenko
525ae72f8e Update documentation 2024-09-12 12:11:18 +00:00
Ivan Savenko
a9c4683da6
Merge pull request #4566 from Laserlicht/outro_support
Campaign outro
2024-09-12 14:20:56 +03:00
Ivan Savenko
d98c6f2e28
Merge pull request #4572 from Fabrice-TIERCELIN/french_update
Update the French translation
2024-09-12 14:16:27 +03:00
Fabrice TIERCELIN
1fdbaf943f Update the French translation 2024-09-10 08:55:10 +02:00
Laserlicht
258d298775
Merge branch 'develop' into outro_support 2024-09-09 23:09:44 +02:00
Laserlicht
0df13040ec doc fix 2024-09-05 21:32:44 +02:00