1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Commit Graph

19754 Commits

Author SHA1 Message Date
Ivan Savenko
dcdd8f0e85 Updated changelog for 1.7.0 2025-04-27 14:16:39 +03:00
Ivan Savenko
4f20bc102b Merge pull request #5652 from kdmcser/hang_fix
Prevent AI from repeatedly swapping the same artifacts
2025-04-27 13:56:11 +03:00
Ivan Savenko
3921b9e214 Merge pull request #5650 from kdmcser/limiter
fix crash when bonus limiter is empty in OwnerUpdater
2025-04-27 13:38:18 +03:00
Ivan Savenko
baae88cf59 Merge pull request #5646 from MichalZr6/necromancy_fix
Fix bug when no casualties but 1 skeleton is raised
2025-04-27 13:37:53 +03:00
Ivan Savenko
be554f4260 Merge pull request #5641 from kdmcser/chinese_encoding
fix Chinese encoding problem in GBK
2025-04-27 13:37:26 +03:00
kdmcser
9dc07b00ff record swap info, if A swap to B,not allow A <-> B in both side 2025-04-27 00:34:44 +08:00
kdmcser
1210f0bf99 fix hang in AI's turn 2025-04-26 23:47:24 +08:00
kdmcser
a17f59b704 fix crash when bonus limiter is empty in OwnerUpdater 2025-04-26 02:15:25 +08:00
Ivan Savenko
0b126ebc8b Merge branch 'vcmi/master' into 'vcmi/develop' 2025-04-25 17:36:11 +03:00
Ivan Savenko
a92e29e008 Merge pull request #5647 from vcmi/beta
Merge beta -> master
1.6.8
2025-04-24 22:50:03 +03:00
Ivan Savenko
a00ec58284 Merge pull request #5644 from IvanSavenko/release_168
Release 1.6.8
2025-04-24 20:55:40 +03:00
Laserlicht
ae45832ffb fix text overflow 2025-04-24 17:44:01 +03:00
Laserlicht
be0f78aae6 fix rightButtonDrag edge case 2025-04-24 17:43:19 +03:00
Michał Zaremba
63906c4446 Fix bug when no casualties but 1 skeleton is raised 2025-04-23 13:45:21 +02:00
Ivan Savenko
87975e4ac6 Backport hypnotize fix 2025-04-23 13:09:54 +03:00
Ivan Savenko
4cbc9c4468 Changelog for 1.6.8 2025-04-23 10:50:11 +03:00
Ivan Savenko
883d33b5bf Version bump to 1.6.8 2025-04-23 10:50:00 +03:00
Ivan Savenko
e0adbb3237 Fix calculating of total cost if hero has non-max amount of points 2025-04-23 10:49:37 +03:00
kdmcser
84202ee64f fix compile error 2025-04-20 00:34:18 +08:00
kdmcser
c3c8b5048a extract functions of string <-> boost::filesystem::path to TextOperations.h 2025-04-20 00:23:41 +08:00
kdmcser
8d25748dba add define for Windows
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-04-19 23:48:21 +08:00
kdmcser
e308b2149a fix compile error 2025-04-19 13:44:48 +08:00
kdmcser
ea3947df4f fix Chinese encoding problem in GBK 2025-04-19 13:30:31 +08:00
Andrey Filipenkov
d1f1acf76c Merge pull request #5638 from vcmi/build-aab-from-archive
add workflow to build android aab file from prebuilt dir
2025-04-17 15:58:03 +03:00
Andrey Filipenkov
bceaa2ba4a add workflow to build android aab file from prebuilt dir 2025-04-17 14:36:49 +03:00
Ivan Savenko
f9c911bd25 Merge pull request #5633 from SoundSSGood/battle-query-fix
Fix end of battle for AI
2025-04-17 12:23:35 +03:00
SoundSSGood
c72c7b6dfa battle query fix 2025-04-16 17:13:20 +02:00
Ivan Savenko
a3c0cc9729 Merge pull request #5632 from SoundSSGood/crash-hotfix-visitBattleResultsApplied
Hotfix visitBattleResultsApplied
2025-04-16 11:32:01 +03:00
SoundSSGood
e847d3322d Hotfix visitBattleResultsApplied 2025-04-15 23:10:04 +02:00
Ivan Savenko
ce89a0d21b Merge pull request #5609 from SoundSSGood/end-of-battle-infowindows
End of battle infowindows refactoring
2025-04-15 22:50:35 +03:00
Ivan Savenko
204b13fc07 Merge pull request #5608 from Laserlicht/campaigneditor
campaign editor
2025-04-15 17:55:13 +03:00
Ivan Savenko
74452116d1 Merge pull request #5619 from Laserlicht/commander_health
fix health bar for commander
2025-04-15 17:53:42 +03:00
Ivan Savenko
8f338db0ec Merge pull request #5627 from IvanSavenko/bonus_fix
Bonus system fixes
2025-04-15 17:50:28 +03:00
Ivan Savenko
8400cfcc49 Merge pull request #5628 from GeorgeK1ng/infoWindow_alignFix
Info window align fix
2025-04-15 17:50:07 +03:00
Ivan Savenko
1b2cd60cc3 Merge pull request #5629 from GeorgeK1ng/haart_munlich
Fix Lord Haart vs Sir Mullich
2025-04-15 17:48:59 +03:00
Ivan Savenko
db2e4c5f6d Include bonus from artifacts to Ballista damage, unify code 2025-04-14 15:50:10 +03:00
George King
9d3e5e5e8d Fix Lord Haart vs Sir Munlich
In original game from GOG is available for random maps Lord Haart not Sir Munlich. Their swap is directly HotA purpose.
2025-04-14 10:13:21 +02:00
George King
a71c70351c Max width for mana field 2025-04-14 00:24:35 +02:00
George King
fce4cbac89 Fix text align in info window 2025-04-14 00:18:39 +02:00
George King
fb587f0deb Fix text align in info window 2025-04-14 00:17:25 +02:00
Ivan Savenko
1cb5f36ccb Fix handling of creature-specific limiters in noneOf limiter on hero
For example, if hero has specialty that provides primary skill bonuses
with "noneOf" limiter that contains limiter that can only be evaluated
in creature context (such as creature level or native terrain), limiter
itself would evaluate to DISCARD, and then will be inverted to ACCEPT by
noneOf limiter. As result, this would give hero bonus to primary skill
even though it is clearly intended to only target creatures.

This introduces NOT_APPLICABLE limiter decision that is not inverted by
noneOf limiter
2025-04-13 23:31:37 +03:00
Ivan Savenko
83099f9288 Fix crash on initializing off-map hero 2025-04-13 23:15:49 +03:00
Ivan Savenko
38a9dc83ba Fix bonuses from battlefield not showing up in creature window 2025-04-13 23:15:15 +03:00
Ivan Savenko
6d8bf24f94 Invalidate hero bonuses on moving to another terrain 2025-04-13 22:23:36 +03:00
Ivan Savenko
2b812be9cd Correctly show results of CreatureTerrainLimiter outside of combat 2025-04-13 22:23:12 +03:00
Ivan Savenko
975d9aedc9 Merge branch 'vcmi/beta' into 'vcmi/develop' 2025-04-13 18:53:54 +03:00
Ivan Savenko
3d4ae903d7 Merge pull request #5620 from IvanSavenko/adela_fix
Better support for Adela specialty (+new modding functionality for it)
2025-04-13 18:42:23 +03:00
Ivan Savenko
896a7ec88e Better support for Adela specialty (+new modding functionality for it)
Fixes Adela specialty that was apparently broken back in #1518 and
replaced with logic that was clearly not tested - it was neither
functional, nor it was following H3 behavior.

- `HAS_ANOTHER_BONUS_LIMITER` now accepts `null` in place of bonus type,
for cases when limiting is needed by bonus source or bonus subtype. This
allows Adela Bless specialty to always work, irregardless of which
bonuses are provided by Bless.
- Implemented `DIVIDE_STACK_LEVEL` updater that functions same as
`TIMES_STACK_LEVEL`, but it divides bonus value, instead of multiplying
it (to make Adela specialty weaker for high-tier units, as in H3)
- Implemented `TIMES_HERO_LEVEL_DIVIDE_STACK_LEVEL` updater that
combines two existing updaters, to implement `val * heroLevel /
unitLevel` formula needed for Adela specialty
- Removed deprecated `ARMY_MOVEMENT` updater. Its functionality has
already been removed in 1.6.X releases, and it was remaining only as a
placeholder
- Updated modding documentation to account for these changes & to remove
some TODO's

Fixed regression from #777 that could led to either duplicated bonuses
or to multiple application of updaters. It introduced double-recursion -
node parents were gathered recursively, and then bonuses were also
collected recursively within each parent. This created situation where
updater could be applied different number of times. For example, hero
bonus that is propagated to unit in combat could be selected directly,
or via hero->combat unit chain, or via hero->garrison unit->combat unit
chains, leading to different calls to updaters if updater handles
garrison unit node type
2025-04-13 16:24:51 +03:00
Ivan Savenko
439c9a7888 Merge pull request #5622 from IvanSavenko/hypno_fix
Fix hypnotize spell
2025-04-13 16:21:14 +03:00
Laserlicht
c9f64993c1 code review 2025-04-12 20:46:33 +02:00