Ivan Savenko
73459876bf
Initial garrison of a town should now match H3 logic
2024-08-29 15:46:22 +00:00
Ivan Savenko
7064374d87
Fix visions not working for towns
2024-08-29 15:46:03 +00:00
Ivan Savenko
b436290d16
Fix crash on right-clicking a neutral town
2024-08-29 15:45:46 +00:00
Ivan Savenko
21fc80a315
Growth of town garrison in neutral towns now uses H3 logic
2024-08-29 15:22:31 +00:00
Xilmi
cc30675730
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-29 17:10:20 +02:00
Ivan Savenko
9a5bee1eaf
Merge pull request #4532 from IvanSavenko/bugfixing
...
Fixes for recent regressions
2024-08-29 17:16:31 +03:00
Ivan Savenko
d0b3bb95b2
Change gamestate initialization order - list of owned objects must be
...
initialized before connecting towns with visiting heroes, but after
generateion of starting heroes
2024-08-29 13:18:33 +00:00
Ivan Savenko
32ad9c1902
Change ordering of UI elements in main menu to fix hota 1.7 menu
2024-08-29 13:18:33 +00:00
Ivan Savenko
9a2d918360
Fixed mouse wheel in xbrz mode, use mouse position information if
...
provided by SDL
2024-08-29 13:18:30 +00:00
Xilmi
aea05b3fb8
Merge remote-tracking branch 'upstream/develop' into develop
2024-08-29 14:42:37 +02:00
Laserlicht
c6f0f8de03
generate assets only when necessary
2024-08-29 00:37:39 +02:00
Laserlicht
f327224d45
remove original resource functionality
2024-08-28 23:44:31 +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
247be94015
Merge pull request #4502 from IvanSavenko/town_building_config
...
Moddable town buildings improvements
2024-08-28 17:56:49 +03:00
Ivan Savenko
4c84379110
Open thieves guild if building provides corresponding bonus
2024-08-28 14:04:47 +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
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
MichalZr6
ca3d81f047
fix crash on heroRoles.clear()
2024-08-28 15:22:00 +02:00
MichalZr6
7ae7c13964
drop setting reachability for turrets
2024-08-28 15:22:00 +02: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
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