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
Ivan Savenko
31dff8f8da
Add coastVisitable property to rewardables, update schemas
2024-09-12 12:11:18 +00:00
Ivan Savenko
503b87561e
Converted all h3 banks to rewardable, remove most of hardcoded checks
2024-09-12 12:11:18 +00:00
Ivan Savenko
785036836c
Rewardable objects may now define guards. Converted Crypt to rewardable.
2024-09-12 12:10:40 +00:00
Xilmi
065125e770
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-10 14:57:27 +02:00
Laserlicht
258d298775
Merge branch 'develop' into outro_support
2024-09-09 23:09:44 +02:00
Laserlicht
7e1eddf530
Revert "roe video in line as ab"
...
This reverts commit f1de265568
2024-09-09 23:08:57 +02:00
Laserlicht
f1de265568
roe video in line as ab
2024-09-06 23:07:24 +02:00
Laserlicht
45625f0355
added AB intro; play only when resource exists
2024-09-06 22:57:53 +02:00
Xilmi
d4ee899565
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-06 17:04:34 +02:00
Laserlicht
6d9385b8bd
outro for RoE
2024-09-05 21:31:17 +02:00
Ivan Savenko
ff8d36c350
It is now possible to define game settings in rmg template
2024-09-05 15:16:28 +00:00
Ivan Savenko
8225eb454e
Added GameSettings to gamestate, potentially allowing to define game
...
settings per map (or in random map template)
2024-09-05 15:16:27 +00:00
Ivan Savenko
6179521364
Merge pull request #4556 from IvanSavenko/town_building_visit
...
Implemented explicitly visitable town buildings, e.g. hota mana vortex
2024-09-05 17:21:21 +03:00
Xilmi
dd5a34d994
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-05 15:54:03 +02:00
Ivan Savenko
624607caae
Merge pull request #4555 from IvanSavenko/xbrz_fonts
...
Improvements for fonts when xbrz is in use
2024-09-05 15:06:25 +03:00
Ivan Savenko
d34b4a141e
Split map object visit from town building visit. Removes side effects
...
from building visit
2024-09-04 14:54:09 +00:00
Ivan Savenko
327ff01471
Implemented explicitly visitable town buildings, e.g. hota mana vortex
...
Added flag `manualHeroVisit` flag to town building. If this flag is set,
then building will only be activated on click and will not give its
effect on hero recrutiment, hero visit, or new day.
This allows implementing changes to Mana Vortex from HotA
2024-09-03 16:31:07 +00:00
Ivan Savenko
8367729235
Added option to define true type fonts size for each xbrz mode
2024-09-03 10:36:50 +00:00
Ivan Savenko
0acc22214b
Read scaling filter for fonts from config
2024-09-02 22:08:19 +00:00
Laserlicht
609906f015
code review (first part)
2024-09-02 22:51:30 +02:00
Xilmi
5ee7061ab7
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-02 17:27:08 +02:00
Laserlicht
c7064377da
code review
2024-09-01 12:23:10 +02:00
Laserlicht
0250c19dd8
portrait fix
2024-09-01 00:41:16 +02:00
Laserlicht
e5f05d61ae
audio mapping
2024-08-31 23:44:36 +02:00
Laserlicht
c803e8011b
overrides
2024-08-31 23:13:40 +02:00
Laserlicht
0280254810
tarnum icon
2024-08-31 22:05:36 +02:00
Laserlicht
46872b764b
integrate campaign intro
2024-08-31 17:57:27 +02:00
Laserlicht
36914682a5
Merge branch 'develop' into chronicles_installer
2024-08-31 16:18:52 +02:00
Laserlicht
16cbd6a7d2
allow custom loadbar-backgrounds for campaigns
2024-08-31 16:03:42 +02:00
Laserlicht
2fef4b5d69
voice override
2024-08-31 14:17:25 +02:00
Laserlicht
e4ec26e613
override
2024-08-31 13:15:07 +02:00
Ivan Savenko
39e5ba32f6
Merge pull request #4530 from IvanSavenko/town_fortifications
...
Support for configurable town fortifications
2024-08-31 13:59:40 +03:00
Xilmi
987a51cccb
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-30 16:45:06 +02:00
Ivan Savenko
7f926fc30e
Merge pull request #4478 from Laserlicht/resource_generation
...
generate assets to file
2024-08-30 15:36:51 +03:00
Xilmi
aea05b3fb8
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-29 14:42:37 +02:00
Laserlicht
aa6cbdf13b
make it also usable on android
2024-08-28 23:07:00 +02:00
Laserlicht
8f24778e9d
config for right drag
2024-08-28 22:36:41 +02:00
Laserlicht
be7d27234f
map drag with right mouse
2024-08-28 22:17:05 +02:00
Ivan Savenko
36c1ed670f
Support for configurable town fortifications
...
Removed most of hardcoded checks for fort level or for presence of fort/
citadel/castle buildings.
It is now possible to define which parts of town fortifications are
provided by town buildings
Configuration for H3-like fortifications is provided in
buildingsLibrary.json and will be used automatically by mods as long as
mods have buidings named "fort", "citadel" and "castle".
Alternatively, mods can separately define:
- hitpoints of walls (shared value for all sections)
- hitpoints of central, upper and lower towers (separate values)
- presence of moat
- shooters for each tower (separate values)
2024-08-28 19:42:14 +00:00
Ivan Savenko
408a632002
Deprecate artifact-related building types
2024-08-28 13:50:08 +00:00
Ivan Savenko
55fd7bd7aa
Thieves guild information level is now a bonus type
2024-08-28 13:50:07 +00:00
Ivan Savenko
8ef8ffa5c4
Implemented configurable blacksmith. Deprecated ballistaYard type
2024-08-28 13:49:42 +00:00
Ivan Savenko
8371232d29
Merge pull request #4504 from Laserlicht/hota_bonus
...
disintegrate bonus
2024-08-28 14:00:11 +03:00
Laserlicht
70190ea1fe
Merge branch 'develop' into resource_generation
2024-08-28 00:03:46 +02:00
Laserlicht
4704e92d98
adjust resource naming
2024-08-28 00:02:29 +02:00
Ivan Savenko
11e8b04ac5
Merge pull request #4463 from SoundSSGood/IMarket-refactoring
...
IMarket refactoring
2024-08-26 22:48:23 +03:00
Tomasz Zieliński
bfe75a6a02
It is now possible to copy object settings between zones
2024-08-24 20:18:36 +02:00
Tomasz Zieliński
64fc2e5ed0
Move ObjectConfig to ObjectInfo.cpp. Preliminary version of banning object categories.
2024-08-24 15:12:22 +02:00
SoundSSGood
4035ab1550
added CMarketWindow::getMarketTitle()
2024-08-24 13:52:54 +03:00
Xilmi
bfd6ee2b09
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-24 12:25:03 +02:00
SoundSSGood
0c5022cae8
Loading market modes from json
2024-08-24 11:51:57 +03:00
Laserlicht
9c4d4e89d6
disintegrate
2024-08-24 00:29:36 +02:00
Laserlicht
02002ce69d
Merge branch 'develop' into resource_generation
2024-08-21 21:52:08 +02:00
Laserlicht
01e55beef1
Merge branch 'develop' into resource_generation
2024-08-20 20:26:52 +02:00
Laserlicht
01c14ae9ce
Merge branch 'develop' into extended_statistic
2024-08-20 20:25:16 +02:00
Xilmi
11cec347f3
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-20 16:17:29 +02:00
Ivan Savenko
85f6030c7c
Merge pull request #4318 from IvanSavenko/upscaled_render
...
Support for xBRZ upscaling filter
2024-08-20 14:23:30 +03:00
Laserlicht
82480e3552
add clean adventure options
2024-08-20 01:46:07 +02:00
Xilmi
2df293f95d
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-19 21:15:34 +02:00
Ivan Savenko
16adf8415f
Add missing property to schema
2024-08-19 11:54:59 +00:00
Ivan Savenko
6fa2bb7e91
Deprecate previously hardcoded buildings
2024-08-19 11:47:13 +00:00
Ivan Savenko
22a126cf2d
Restored replacement of town building bonuses via building upgrade
2024-08-19 11:47:13 +00:00
Ivan Savenko
abfb467f68
Cleanup old code, add compatibility for 1.5 mods
2024-08-19 11:47:13 +00:00
Ivan Savenko
f1e63792f0
Greatly simplify town buildings logic
2024-08-19 11:47:13 +00:00
Ivan Savenko
57430c101f
Extracted common properties of buildings into a shared file
2024-08-19 11:47:13 +00:00
Ivan Savenko
49412579b4
Use 1.6 repository
2024-08-18 20:48:16 +00:00
Xilmi
e6d907af55
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-18 09:52:59 +02:00
Ivan Savenko
d6059b044d
Implement selection of upscaling filter in launcher
2024-08-17 15:25:26 +00:00
Ivan Savenko
e3e44a8ff7
Implemented TODO's in schema
2024-08-15 18:16:49 +00:00
Laserlicht
a42afa2910
code review
2024-08-14 21:51:08 +02:00
Laserlicht
81b1704e39
Merge branch 'vcmi:develop' into extended_statistic
2024-08-14 20:32:47 +02:00
Ivan Savenko
72896d4ed5
Added (mostly) complete schema for validation of rewardable
2024-08-14 17:04:44 +00:00
Ivan Savenko
2151a7fc88
Moved configuration of rewardable town building to 'configuration' entry
2024-08-14 17:04:43 +00:00
Ivan Savenko
cfddba1e2a
Fix json formatting
2024-08-14 17:04:43 +00:00
Ivan Savenko
ae256e41a5
Deprecate mana vortex building
2024-08-14 17:04:43 +00:00
Ivan Savenko
b4baaa5105
Use town-specific string for Stables instead of one for adventure map
2024-08-14 17:04:43 +00:00
Ivan Savenko
951b89402b
Deprecate buildings that should now use configurable buildings
2024-08-14 17:04:43 +00:00
Ivan Savenko
580855ec2e
Replace hardcoded buildings logic that can be represented with
...
configurable buildings
2024-08-14 17:04:43 +00:00
Ivan Savenko
bde4f8becc
add validation for building type instead of obscure error message
2024-08-14 17:03:25 +00:00
Ivan Savenko
89dca5061d
Merge pull request #4384 from Laserlicht/shortcut
...
add shortcut for list item ordering
2024-08-14 17:04:45 +03:00
Ivan Savenko
1fb8ab5f70
Merge pull request #4429 from Laserlicht/regions
...
defining own regions extend
2024-08-14 17:04:13 +03:00
Laserlicht
9e9a6f1c5f
Merge branch 'develop' into extended_statistic
2024-08-13 00:49:51 +02:00
Laserlicht
da38ad5f5c
code review
2024-08-12 17:57:34 +02:00
Laserlicht
52b1219db6
code review
2024-08-12 17:53:24 +02:00
Xilmi
d851ca1c74
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-12 17:40:55 +02:00
Ivan Savenko
f7c82d7909
Merge pull request #4400 from kdmcser/support_0_spellpower_and_knowledge
...
support configure for minimal primary skill values
2024-08-12 17:16:46 +03:00
Laserlicht
1e298534ae
shortcut
2024-08-12 01:07:58 +02:00
Laserlicht
9a9cc10ee7
use Strg instead mouse pos
2024-08-09 22:50:09 +02:00
kdmcser
79f5d260a4
use primary skill array
2024-08-08 22:03:54 +08:00
Xilmi
a7240041ec
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-07 16:15:28 +02:00
