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

1974 Commits

Author SHA1 Message Date
George King
3c2096a188
Fixed Imp Chache typo
Fixed InpCache -> ImpCache
2024-10-29 09:52:51 +01:00
George King
719991b33a
Fixed spacing between sentences 2024-10-29 07:47:56 +01:00
Xilmi
ffd8758017 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-28 17:49:08 +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
Ivan Savenko
c2e49bd10a
Merge pull request #4821 from IvanSavenko/flaggable
Basic support for configurable flaggable objects
2024-10-27 21:19:22 +02:00
Xilmi
cf8888987d Merge remote-tracking branch 'upstream/develop' into develop 2024-10-27 10:03:26 +01: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
George King
c927324b19
Fixed spacing between sentences 2024-10-25 22:13:28 +02:00
Ivan Savenko
ee59bc4e71 Add bonus description generation for map objects 2024-10-25 18:36:02 +00:00
Ivan Savenko
8a5ac73438 Basic support for configurable flaggable objects
Converted CGLighthouse class into FlaggableMapObject

Bonus provided by Lighthouse/Flaggable is now defined in config and is
accessible to mods.
2024-10-25 16:48:10 +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
Xilmi
5d6877e06d Merge remote-tracking branch 'upstream/develop' into develop 2024-10-20 00:49:17 +02:00
nick huang
7e4b268a78 Building dependence of Unicorn Glide in Rampart should include Dendroid Arches 2024-10-18 20:04:00 +08:00
Ivan Savenko
c25aef8f48
Merge pull request #4766 from SoundSSGood/fused-artifacts
Fused artifacts
2024-10-16 15:08:20 +03:00
Olegmods
5e093d82b7
Update battlefields.json 2024-10-15 23:02:27 +03:00
Olegmods
049c6c539f
Revert changes 2024-10-15 23:01:53 +03:00
SoundSSGood
86d5c05ffa Fused identical artifacts 2024-10-15 16:51:29 +03:00
Olegmods
5f34d3b067
Update obstacles.json 2024-10-15 14:15:43 +03:00
Olegmods
6c4e7f8058
Update obstacles.json 2024-10-15 11:09:14 +03:00
Laserlicht
9ed4dbaeb4 Merge remote-tracking branch 'upstream/develop' into adv_search 2024-10-14 19:52:55 +02:00
Xilmi
533806df6d Merge remote-tracking branch 'upstream/develop' into develop 2024-10-11 19:07:56 +02:00
heroesiiifan
b56b6c1496
Update campaignMedia.json 2024-10-10 21:44:08 +00:00
Xilmi
61fba1fedd Merge remote-tracking branch 'upstream/develop' into develop 2024-10-10 17:23:39 +02:00
Ivan Savenko
68e5cff276 Implement user-defined cursor scaling 2024-10-09 17:37:54 +00:00
Ivan Savenko
7d58f89992 Change default resolution from 800x600 to 1280x720 2024-10-09 17:37:54 +00:00
Ivan Savenko
daa706b847 Enable fullscreen as default 2024-10-09 17:37:54 +00:00
Ivan Savenko
42adc9d394 Enable auto-detection of UI scaling 2024-10-09 17:37:54 +00:00
Xilmi
9a40577994 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-08 16:15:22 +02:00
Ivan Savenko
2399a5a765
Merge pull request #4712 from IvanSavenko/detect_conflict
Detection of potential conflicts between mods
2024-10-07 17:57:52 +03:00
Laserlicht
344e845684
Merge branch 'develop' into adv_search 2024-10-07 12:56:54 +02:00
Laserlicht
a826b88641
Merge branch 'develop' into spell 2024-10-07 12:55:23 +02:00
Ivan Savenko
8e4152bc81 It is now possible to define objects directly in mod.json instead of
using path to file with object definition
2024-10-06 19:42:15 +00:00
Ivan Savenko
66fdad145c Added an option to configure validation level in launcher 2024-10-06 19:21:33 +00:00
Ivan Savenko
a7027e10f4
Merge pull request #4696 from Laserlicht/color_param
color shift parameter to config
2024-10-06 16:03:45 +03:00
Xilmi
ddfeab8748 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-03 13:38:51 +02:00
Laserlicht
e86b694b22 fast search 2024-10-01 21:36:45 +02:00
Laserlicht
d04f369d85 search basic implementation 2024-10-01 18:15:32 +02: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
Laserlicht
be31041a48
"general" -> "interface" 2024-10-01 16:09:22 +02:00
Xilmi
3d9892f6b3 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-01 16:08:57 +02: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
Ivan Savenko
46ed052714
Merge pull request #4692 from dydzio0614/change-default-ai
Change default neutral creatures AI to BattleAI
2024-10-01 15:28:43 +03:00
Ivan Savenko
6b72549078
Merge pull request #4690 from IvanSavenko/ttf_tweaks
Tweaks for scalable / true type fonts
2024-10-01 15:28:11 +03:00
Laserlicht
844b078482 color shift parameter to config 2024-09-30 19:46:53 +02:00
Laserlicht
713fcd6543 research per day & seperate config 2024-09-30 02:40:28 +02:00
Dydzio
3c9ec0c30e Change neutral AI to BattleAI 2024-09-29 15:44:24 +02:00
Xilmi
58eeccd119 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-29 12:35:44 +02:00
Ivan Savenko
532ed9b12c Adjusted ttf font sizes to better match H3 fonts 2024-09-28 19:29:49 +00:00
Dydzio
ac380b0f4c Remove block of conflux creatures idle animations 2024-09-28 19:12:32 +02:00
Laserlicht
e6cb87abac cast only on self 2024-09-28 17:32:53 +02:00
Laserlicht
8461189e95 code review + text 2024-09-28 16:10:03 +02:00
Laserlicht
f94f0a3274 new dialog 2024-09-28 15:51:53 +02:00
Laserlicht
d929bfb9d1 rename; introduce factor 2024-09-28 15:05:13 +02:00
Laserlicht
2052a26031 code review 2024-09-28 14:25:11 +02:00
Laserlicht
3559f9f923 HMI for spell research 2024-09-28 01:47:32 +02:00
Laserlicht
a9327b3fa3 netpacks 2024-09-27 22:47:22 +02:00
Laserlicht
efcac3b933 settings 2024-09-27 20:16:41 +02:00
Ivan Savenko
7f8f09c8fa
Merge pull request #4668 from Laserlicht/scenario_name
Chronicles improvements
2024-09-27 20:01:47 +03:00
Ivan Savenko
19db016473
Merge pull request #4654 from dydzio0614/any-hex-shooting
Allow targeting empty hex by shooters with multi-tile SPELL_LIKE_ABILITY
2024-09-27 19:23:33 +03:00
Ivan Savenko
69d9e34ebf
Merge pull request #4642 from Laserlicht/invincible_improvements
Invincible bonus: only blocking non positive spells; counterstrike
2024-09-27 18:58:00 +03:00
Xilmi
1d831022e8 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-25 14:08:34 +02:00
Laserlicht
2d60252e4c read from mapheader; move chr to subfolder 2024-09-24 21:41:37 +02:00
MichalZr6
303b0a6552 Fixes based on review remarks 2024-09-24 18:29:01 +02:00
Ivan Savenko
ca3c6227c4 Add selector for font type in Launcher, add autoselection 2024-09-24 13:25:36 +00:00
Ivan Savenko
87274128e7 Proper support for usage of multiple fonts in a chain 2024-09-24 10:59:35 +00:00
Laserlicht
138cbc6a81 scenario name for campaigns 2024-09-24 11:23:10 +02:00
Ivan Savenko
557b72f2b3 Launcher now controls ttf fonts usage directly instead of toggling mod
from extras
2024-09-23 18:31:44 +00:00
Ivan Savenko
97e24ff126 Integrated Noto fonts into vcmi 2024-09-23 18:15:30 +00:00
Dydzio
711b0e70d9 Handle new config entry in gamesettings schema 2024-09-23 17:00:08 +02:00
Dydzio
230893f423 Merge branch 'develop' into any-hex-shooting 2024-09-23 16:57:27 +02:00
Ivan Savenko
dbfa5b8b2d
Merge pull request #4637 from IvanSavenko/validate_gamesettings
Added validation of game settings
2024-09-23 17:28:37 +03:00
Xilmi
e7e4d6cc72 Fix invincible Hellbardiers 2024-09-23 01:23:18 +02:00
Xilmi
9ef2c6f8a0 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-22 23:43:29 +02:00
Laserlicht
760aa0c499
fix creature mistake 2024-09-22 21:58:39 +02:00
Dydzio
bf9a9283a4 Make any hex shooting possibility configurable 2024-09-22 16:58:15 +02:00
Xilmi
d679ee72b9 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-22 12:21:20 +02:00
kdmcser
d6e69b9586 not report warning in factory-town 2024-09-22 14:22:56 +08:00
Ivan Savenko
e07340b531 Added validation of game settings
Should detect invalid config in all sources of settings - vcmi config,
mods, random map templates
2024-09-21 15:34:33 +00:00
Ivan Savenko
43666ec987
Merge pull request #4627 from Laserlicht/chronicles_config
avoid warnings if not installed chronicles
2024-09-21 17:46:55 +03:00
Tomasz Zieliński
79c4d7d51f Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone 2024-09-21 14:20:56 +02:00
Tomasz Zieliński
dbee822454 Update json schema 2024-09-21 13:52:25 +02:00
Ivan Savenko
3209aa58e8
Merge pull request #4626 from Laserlicht/fix_settings
missing default value
2024-09-20 11:50:58 +03:00
Ivan Savenko
cb96b9959e
Merge pull request #4623 from Laserlicht/invincible_bonus
INVINCIBLE bonus
2024-09-20 11:50:29 +03:00
Laserlicht
417fb8d434 avoid warnings if not installed chronicles 2024-09-19 22:14:23 +02:00
Laserlicht
2394809abd missing default value 2024-09-19 21:36:03 +02:00
Xilmi
7c8f4c423c Merge remote-tracking branch 'upstream/develop' into develop 2024-09-19 17:35:18 +02:00
Ivan Savenko
fb28de5beb
Merge pull request #4531 from Laserlicht/mouse_right_drag
map drag with right mouse
2024-09-19 16:42:33 +03:00
Laserlicht
b36c05df1d INVINCIBLE bonus 2024-09-19 03:14:45 +02:00
Laserlicht
0aaafc4c8a cast without skip 2024-09-14 15:10:24 +02:00
Tomasz Zieliński
2fe54504ab Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone
# Conflicts:
#	lib/rmg/CRmgTemplate.cpp
2024-09-14 10:19:22 +02:00
Xilmi
a1a03d4b74 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-12 14:54:39 +02:00
Ivan Savenko
84c82a807d Fix texts in shipwreck 2024-09-12 12:11:18 +00:00
Ivan Savenko
d20d9bd96b Fix generation of placeholders for banks 2024-09-12 12:11:18 +00:00
Ivan Savenko
2ee4e42348 Implement placeholders for creature banks messages 2024-09-12 12:11:18 +00:00
Ivan Savenko
a19a55b4ae Add checking handler type for validness, deprecate 'bank' handler 2024-09-12 12:11:18 +00:00
Ivan Savenko
39a2c29c97 Removed creatureBank flag from battle, battles now receive BattleLayout
struct that defines how units are placed in combat
2024-09-12 12:11:18 +00:00
Ivan Savenko
c55e07dabc Fix typo in schema, fix ballista yard 2024-09-12 12:11:18 +00:00