1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Commit Graph

6424 Commits

Author SHA1 Message Date
1c809bcb88 fixes build on clang 2024-09-03 00:25:35 +02:00
ee64928454 Merge pull request #4448 from smanolloff/split-client+develop
Split vcmiclient in two
2024-09-02 15:34:05 +03:00
e502853227 address code review comments 2024-08-31 18:14:05 +03:00
39e5ba32f6 Merge pull request #4530 from IvanSavenko/town_fortifications
Support for configurable town fortifications
2024-08-31 13:59:40 +03:00
71c7beb7a5 Merge pull request #4533 from IvanSavenko/town_growth
Change logic of neutral towns garrisons to match H3
2024-08-31 13:52:36 +03:00
0a72a0a48e Merge pull request #4534 from SoundSSGood/BulkEraseArtifacts
BulkEraseArtifacts network pack
2024-08-31 13:52:26 +03:00
8cfc1c4ee1 Merge pull request #4535 from IvanSavenko/savecompat_bump
Removed save compatibility with 1.4
2024-08-31 13:51:10 +03:00
7f926fc30e Merge pull request #4478 from Laserlicht/resource_generation
generate assets to file
2024-08-30 15:36:51 +03:00
82c37573fa Removed save compatibility with 1.4
All save compatibility checks targeting 1.4 saves have now been removed.
Saves from 1.5 can still be loaded in 1.6

Implemeted few TODO's in serialization that were postponed to avoid
breaking save compatibility in MP for 1.5.X releases.

Fixed missed case for loading black market object from 1.5 saves
2024-08-29 18:51:53 +00:00
e15ea4fc75 BulkEraseArtifacts network pack 2024-08-29 20:22:08 +03:00
7064374d87 Fix visions not working for towns 2024-08-29 15:46:03 +00:00
32ad9c1902 Change ordering of UI elements in main menu to fix hota 1.7 menu 2024-08-29 13:18:33 +00:00
9a2d918360 Fixed mouse wheel in xbrz mode, use mouse position information if
provided by SDL
2024-08-29 13:18:30 +00:00
c6f0f8de03 generate assets only when necessary 2024-08-29 00:37:39 +02:00
f327224d45 remove original resource functionality 2024-08-28 23:44:31 +02:00
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
4c84379110 Open thieves guild if building provides corresponding bonus 2024-08-28 14:04:47 +00:00
408a632002 Deprecate artifact-related building types 2024-08-28 13:50:08 +00:00
55fd7bd7aa Thieves guild information level is now a bonus type 2024-08-28 13:50:07 +00:00
a1a194d904 Allow replacing war machine if hero has a different machine in the slot 2024-08-28 13:49:42 +00:00
8ef8ffa5c4 Implemented configurable blacksmith. Deprecated ballistaYard type 2024-08-28 13:49:42 +00:00
ce1e0b8875 Moved NewTurn pack generation to NewTurnProcessor 2024-08-28 13:03:24 +00:00
0fd9dbf240 Unified income handling, added IOwnableObject interface 2024-08-28 12:40:44 +00:00
58da447f43 Merge pull request #4523 from IvanSavenko/xbrz_fixes
Xbrz fixes
2024-08-28 15:39:45 +03:00
70190ea1fe Merge branch 'develop' into resource_generation 2024-08-28 00:03:46 +02:00
4704e92d98 adjust resource naming 2024-08-28 00:02:29 +02:00
a2bac260e7 Fix images with custom scaling in xBRZ mode 2024-08-27 19:49:41 +00:00
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
d47271de6c avoid zero size Y axis 2024-08-27 21:41:50 +02:00
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
20ccc92e6d move shutdown functions in EntryPoint 2024-08-27 13:12:55 +03:00
e9131538dd Merge branch 'develop' into split-client+develop 2024-08-27 03:05:07 +03:00
01396b62b7 Extracted handling of type ID's from serializer into a separate class 2024-08-26 19:48:46 +00:00
232a759db7 Remove type registration from library pack applying 2024-08-26 19:48:46 +00:00
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
11e8b04ac5 Merge pull request #4463 from SoundSSGood/IMarket-refactoring
IMarket refactoring
2024-08-26 22:48:23 +03:00
7b746bcaec Merge pull request #4496 from Laserlicht/statistic_improve
Statistics improve
2024-08-26 19:12:56 +03:00
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
3d39963a1c Merge branch 'master' into 'develop' 2024-08-26 14:01:00 +00:00
2a6525c5ef Check battleInt->curInt instead of battleInt 2024-08-25 19:43:21 +00:00
619b35ab33 Allow dialogs when in battle interface
But also it is not our turn
2024-08-25 19:43:14 +00:00
2c5a1bcbb4 remove comment out line 2024-08-25 11:48:17 +02:00
d9d82fc836 add horicaontal grid + fixes 2024-08-25 02:21:24 +02:00
3671079754 Added artifact description 2024-08-24 16:37:11 -07:00
95d2fbc9b7 fix grid 2024-08-25 00:43:55 +02:00
62790e9aad scaling anim have problems -> use other icon 2024-08-25 00:33:36 +02:00
6e33b86dcb fix days surived 2024-08-24 23:36:01 +02:00
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
c22820f484 Merge pull request #4484 from Laserlicht/text_len
campaign text length
2024-08-24 16:06:31 +03:00
3e605253db Merge pull request #4481 from Laserlicht/fix_hota
fix for 8th creature
2024-08-24 16:06:12 +03:00