Ivan Savenko
691a1a666d
Moved most of town growth handling to NewTurnProcessor
2024-08-28 13:03:13 +00:00
Ivan Savenko
d49a61645c
All objects that can be owned by player now implement IOwnableObject
2024-08-28 12:51:28 +00:00
Ivan Savenko
a481f07daf
PlayerState now stores all objects owned by player
2024-08-28 12:51:27 +00:00
Ivan Savenko
0fd9dbf240
Unified income handling, added IOwnableObject interface
2024-08-28 12:40:44 +00:00
Ivan Savenko
189cb1c762
Moved most of daily income handling to a separate method
2024-08-28 12:40:44 +00:00
Ivan Savenko
58da447f43
Merge pull request #4523 from IvanSavenko/xbrz_fixes
...
Xbrz fixes
2024-08-28 15:39:45 +03:00
Ivan Savenko
8371232d29
Merge pull request #4504 from Laserlicht/hota_bonus
...
disintegrate bonus
2024-08-28 14:00:11 +03:00
Ivan Savenko
536134d396
Merge pull request #4522 from Laserlicht/fix_chart
...
avoid zero size Y axis
2024-08-28 13:59:30 +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
a2bac260e7
Fix images with custom scaling in xBRZ mode
2024-08-27 19:49:41 +00:00
Ivan Savenko
0bbc2bce33
Fix handling of transparency in xbrz and in images with non-cyan
...
transparent color in unscaled mode
2024-08-27 19:44:11 +00:00
Laserlicht
d47271de6c
avoid zero size Y axis
2024-08-27 21:41:50 +02:00
Ivan Savenko
d3ed18ae2a
Merge pull request #4517 from rtissera/fix-debug-non-amd64-build
...
Fix debug non-amd64 builds with CMake
2024-08-27 20:13:25 +03:00
Ivan Savenko
5da00799c4
Merge pull request #4520 from IvanSavenko/market_fix
...
Remove marketModes as member
2024-08-27 17:59:47 +03:00
Ivan Savenko
20d5b33ea6
Remove marketModes as member
...
marketModes are now generated in runtime and are not a member of
IMarket. Was not a bad change, but towns load buildings before town type
is randomized, leading to case where market modes are not actually known
when building is added to town (like random towns with market built)
Since altar requires CArtifactSet for work, IMarket will now always
contain it, but it will only be accessible if market supports altar
mode.
2024-08-27 14:07:00 +00:00
Simeon Manolov
20ccc92e6d
move shutdown functions in EntryPoint
2024-08-27 13:12:55 +03:00
Simeon Manolov
e9131538dd
Merge branch 'develop' into split-client+develop
2024-08-27 03:05:07 +03:00
Ivan Savenko
2ffce4a7c2
Merge pull request #4503 from IvanSavenko/simple_register_types
...
Simplify logic of types registration for serialization
2024-08-27 00:25:07 +03:00
Ivan Savenko
f765f212bb
Restore save compatibility
2024-08-26 20:52:37 +00:00
Ivan Savenko
ac271c09b9
Add mechanism to provide save compatibility if class is removed or
...
addded
2024-08-26 20:06:36 +00:00
Ivan Savenko
c64dcfaa0f
Fix build
2024-08-26 20:06:36 +00:00
Ivan Savenko
77faa14119
Added explicit indexing of type indexes for serialization
2024-08-26 20:06:35 +00:00
Ivan Savenko
01396b62b7
Extracted handling of type ID's from serializer into a separate class
2024-08-26 19:48:46 +00:00
Ivan Savenko
232a759db7
Remove type registration from library pack applying
2024-08-26 19:48:46 +00:00
Ivan Savenko
b84af1a6de
Significantly simplify packs applying
...
Apparently our logic for packs applying with types registration is
overcomplicated and by now completely unnecessary - it became redundant
after introduction of visitor pattern.
2024-08-26 19:48:46 +00:00
Ivan Savenko
11e8b04ac5
Merge pull request #4463 from SoundSSGood/IMarket-refactoring
...
IMarket refactoring
2024-08-26 22:48:23 +03:00
Romain TISSERAND
c11ec8a3cf
Fix debug non-amd64/x86_64 builds with CMake
2024-08-26 20:55:23 +02:00
Ivan Savenko
7b746bcaec
Merge pull request #4496 from Laserlicht/statistic_improve
...
Statistics improve
2024-08-26 19:12:56 +03:00
Ivan Savenko
897bc65e64
Merge pull request #4508 from kaja47/dead-code-must-die
...
remove never used code in CBonusSystemNode
2024-08-26 19:11:03 +03:00
Ivan Savenko
e65eaf0e06
Merge pull request #4506 from mikeiit/add_missisng_stack_artifact_description
...
Added missing stack artifact description
2024-08-26 19:10:48 +03:00
Ivan Savenko
3d39963a1c
Merge branch 'master' into 'develop'
2024-08-26 14:01:00 +00:00
Andrii Danylchenko
ed36b1a882
Battle AI: fix casting Implosion when it kills target stack, fix casting summon elementals
2024-08-26 16:58:27 +03:00
Andrii Danylchenko
d55996cc46
Battle AI: fix firewall, fix haste spellcast evaluation for waits and movements, allow location spells
2024-08-26 11:31:00 +03:00
Ivan Savenko
a3e33215e3
Merge pull request #4510 from vcmi/beta
...
Merge beta -> master
2024-08-26 00:27:47 +03:00
Ivan Savenko
6fbfcef99e
Merge pull request #4509 from IvanSavenko/update_157
...
Cherry-pick spellcasting fix and bump release date
2024-08-25 23:10:43 +03:00
MichalZr6
2a6525c5ef
Check battleInt->curInt instead of battleInt
2024-08-25 19:43:21 +00:00
MichalZr6
619b35ab33
Allow dialogs when in battle interface
...
But also it is not our turn
2024-08-25 19:43:14 +00:00
Ivan Savenko
a7d4df9c33
Update release date to monday
2024-08-25 19:42:25 +00:00
K
462c79e190
remove never used code in CBonusSystemNode
...
Method CBonusSystemNode::getAllBonuses have 'root' parameter which is never
set to anythig else than nullptr. This patch removes the parameter and all
code that depends on it as preparatory work for further bonus system
optimization.
2024-08-25 14:15:21 +02:00
Laserlicht
2c5a1bcbb4
remove comment out line
2024-08-25 11:48:17 +02:00
Laserlicht
d9d82fc836
add horicaontal grid + fixes
2024-08-25 02:21:24 +02:00
Mike
3671079754
Added artifact description
2024-08-24 16:37:11 -07:00
Laserlicht
95d2fbc9b7
fix grid
2024-08-25 00:43:55 +02:00
Laserlicht
62790e9aad
scaling anim have problems -> use other icon
2024-08-25 00:33:36 +02:00
Laserlicht
6e33b86dcb
fix days surived
2024-08-24 23:36:01 +02:00
Ivan Savenko
a819c3fc29
Merge pull request #4482 from MichalZr6/mapeditor_fixes
...
Mapeditor refactor, fixes and additional validation checks
2024-08-24 16:18:53 +03:00
Ivan Savenko
6d8bc9b859
Merge pull request #4500 from MichalZr6/allow_dialogs_when_in_battle
...
Allow dialogs when in battle interface but not on the players turn
2024-08-24 16:18:20 +03:00
Ivan Savenko
51fafe66cb
Merge pull request #4485 from kaja47/opto-isinthemap
...
Optimize CMap::isInTheMap
2024-08-24 16:06:44 +03:00
Ivan Savenko
c22820f484
Merge pull request #4484 from Laserlicht/text_len
...
campaign text length
2024-08-24 16:06:31 +03:00
