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

17057 Commits

Author SHA1 Message Date
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
a1a194d904 Allow replacing war machine if hero has a different machine in the slot 2024-08-28 13:49:42 +00:00
Ivan Savenko
8ef8ffa5c4 Implemented configurable blacksmith. Deprecated ballistaYard type 2024-08-28 13:49:42 +00:00
Ivan Savenko
175f6716d2
Merge pull request #4518 from IvanSavenko/new_turn_refactor
Refactor new turn processing on server
2024-08-28 16:49:22 +03:00
Andrey Filipenkov
3e6f64d6b6
[docs][iOS] add one more ipa signing option 2024-08-28 16:12:20 +03:00
Ivan Savenko
462aea7e9a Fix build 2024-08-28 13:12:11 +00:00
Ivan Savenko
d4ba7e12b0 Fix regressions 2024-08-28 13:03:45 +00:00
Ivan Savenko
e90d057296 Tweaks to fow reveal on new turn 2024-08-28 13:03:45 +00:00
Ivan Savenko
e5f1d60298 Add save compatibility 2024-08-28 13:03:44 +00:00
Ivan Savenko
37658478fa Move timed events to NewTurnProcessor 2024-08-28 13:03:26 +00:00
Ivan Savenko
ce1e0b8875 Moved NewTurn pack generation to NewTurnProcessor 2024-08-28 13:03:24 +00:00
Ivan Savenko
10a9d777c7 Moved mana and movement points refresh to NewTurnProcessor 2024-08-28 13:03:15 +00:00
Ivan Savenko
c09c414f5a Moved roll for week type to NewTurnProcessor 2024-08-28 13:03:15 +00:00
Ivan Savenko
020f1d1f46 Moved rumors generation to NewTurnProcessor 2024-08-28 13:03:15 +00:00
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
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