Xilmi
ffd8758017
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-28 17:49:08 +01:00
Ivan Savenko
a97deea563
Merge pull request #4824 from IvanSavenko/translate_fix
...
Fixes for issues with translations
2024-10-28 12:56:50 +02:00
Ivan Savenko
e5739e49da
Fix translation of bank names
2024-10-26 11:39:06 +00:00
Ivan Savenko
7ae5e2b406
Added support for daily income to flaggable objects
2024-10-25 19:01:00 +00:00
Ivan Savenko
ee59bc4e71
Add bonus description generation for map objects
2024-10-25 18:36:02 +00:00
Ivan Savenko
8a5ac73438
Basic support for configurable flaggable objects
...
Converted CGLighthouse class into FlaggableMapObject
Bonus provided by Lighthouse/Flaggable is now defined in config and is
accessible to mods.
2024-10-25 16:48:10 +00:00
Xilmi
2b99414793
Using hero's stats instead of level to determine their role.
...
Since there are custom maps/campaigns in which heroes have pretty high base-stats even at level 1.
2024-10-21 09:37:44 +02:00
Xilmi
5d6877e06d
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-20 00:49:17 +02:00
Ivan Savenko
604e3b5c67
Merge pull request #4763 from IvanSavenko/herohandler_split
...
Split CHeroHandler.cpp/.h into 1 file per class
2024-10-14 19:05:48 +03:00
Ivan Savenko
10ad0fc760
Split CHeroHandler.cpp/.h into 1 file per class
...
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
2024-10-13 14:01:09 +00:00
Ivan Savenko
ad7f0416a7
Added overloaded version of getObjectHandler to CGHeroInstance
2024-10-13 13:06:31 +00:00
Ivan Savenko
31095248ab
Removed typeName and subtypeName properties from CGObjectInstance
2024-10-13 13:05:50 +00:00
Xilmi
533806df6d
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-11 19:07:56 +02:00
Ivan Savenko
c55a75cc4e
Remove copy-pasted code in rewardable town building leading to hero not
...
registered as visitor
2024-10-11 15:02:48 +00:00
Ivan Savenko
d1e7cb72c2
Fix game gang on random map generation
2024-10-11 15:02:14 +00:00
Ivan Savenko
e221cdccab
Fix initialization of hero type in map editor
2024-10-11 15:01:55 +00:00
Xilmi
61fba1fedd
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-10 17:23:39 +02:00
Ivan Savenko
3dd4fa2528
Reduce usage of pointers to VLC entities
...
Final goal (of multiple PR's) is to remove all remaining pointers from
serializeable game state, and replace them with either identifiers or
with shared/unique pointers.
CGTownInstance::town and CGHeroInstance::type members have been removed.
Now this data is computed dynamically using subID member.
VLC entity of a town can now be accessed via following methods:
- getFactionID() returns ID of a faction
- getFaction() returns pointer to a faction
- getTown() returns pointer to a town
VLC entity of a hero can now be accessed via following methods:
- getHeroTypeID() returns ID of a hero
- getHeroClassID() returns ID of a hero class
- getHeroType() returns pointer to a hero
- getHeroClass() returns pointer to a hero class
2024-10-10 12:28:08 +00:00
Ivan Savenko
a8f8c3f4b1
Replaced most of accesses to CGObjectInstance::pos with anchorPoint()
2024-10-09 15:43:46 +00:00
Xilmi
9a40577994
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-08 16:15:22 +02:00
Ivan Savenko
c0f5c7c0ea
Replace pointer with reference in pack apply functions
2024-10-07 14:59:46 +00:00
Laserlicht
a826b88641
Merge branch 'develop' into spell
2024-10-07 12:55:23 +02:00
Ivan Savenko
cd52625657
Merge pull request #4710 from kdmcser/display_attack_type
...
display attack type(melee/ranged) in popup window
2024-10-06 16:04:39 +03:00
Ivan Savenko
5d64da9b6c
Fixes randomization of Witch Hut preconfigured in map editor
2024-10-03 12:35:15 +00:00
Ivan Savenko
f5c2772f8d
Fix potential int32_t overflow when computing total army value
2024-10-02 19:48:08 +00:00
kdmcser
60177bffab
remove bracket
2024-10-02 19:57:26 +08:00
kdmcser
4896b51a5d
display attack type(melee/ranged) in popup window
2024-10-02 19:08:40 +08:00
Xilmi
c19d885603
Subterranean Gateway fix
...
Fixed an issue that caused pathfinding for player and AI not working when a subterranean gate was too close to the edge of the map.
Fixed another issue that played into pathfinding for AI not working when a subterranean gate was too close to the edge of the map.
2024-10-02 00:10:45 +02:00
Laserlicht
9c6bd20159
code review
2024-10-01 16:32:28 +02:00
Xilmi
3d9892f6b3
Merge remote-tracking branch 'upstream/develop' into develop
2024-10-01 16:08:57 +02:00
Ivan Savenko
cef7466c71
Merge pull request #4643 from SoundSSGood/CArtHandler-refactoring
...
CArtifactSet tidy up
2024-10-01 16:26:32 +03:00
DjWarmonger
ffed9480e0
Merge pull request #4483 from vcmi/custom_objects_per_zone
...
Customizable objects in RMG zones
2024-10-01 14:58:35 +02:00
Laserlicht
713fcd6543
research per day & seperate config
2024-09-30 02:40:28 +02:00
Laserlicht
d929bfb9d1
rename; introduce factor
2024-09-28 15:05:13 +02:00
Laserlicht
2052a26031
code review
2024-09-28 14:25:11 +02:00
Laserlicht
7707adc44f
checks on server
2024-09-28 01:18:10 +02:00
Ivan Savenko
f2c20b54d0
Unify rewardable map object and town building code
2024-09-27 15:41:24 +00:00
Ivan Savenko
072aa8aadd
Remove unused method
2024-09-27 15:41:24 +00:00
Xilmi
1d831022e8
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-25 14:08:34 +02:00
SoundSSGood
586a32a616
CArtifactSet cleanup
2024-09-23 23:39:19 +03:00
SoundSSGood
b9ae7f1138
CMap put move and remove artifact method
2024-09-23 23:30:38 +03:00
Ivan Savenko
e93a060500
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-09-23 14:25:53 +00:00
Xilmi
d679ee72b9
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-22 12:21:20 +02:00
Tomasz Zieliński
79c4d7d51f
Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone
2024-09-21 14:20:56 +02:00
Laserlicht
081ba4839c
added town info
2024-09-18 22:39:53 +02:00
Xilmi
27aed74397
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-18 14:52:24 +02:00
Laserlicht
6aa29ac8ee
show creature level
2024-09-17 22:34:09 +02:00
Dydzio
7979f62f82
Add status bar movement points info for own hero on adventure map or hero list
2024-09-17 21:38:28 +02:00
Ivan Savenko
8b2821456a
Show generic dialog if building was already visited
2024-09-16 19:51:10 +00:00
Ivan Savenko
c2dc88bf06
Fix refusing a reward, for example from Tree of Knowledge
2024-09-15 10:32:29 +00:00
