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 |
|
godric3
|
d078c5ff2d
|
store ObjectInstanceID of objects to remove instead of their position
|
2024-09-30 20:44:40 +02:00 |
|
godric3
|
e50ba14bbe
|
Use exact position of object to remove + add object name to list of objects to remove
|
2024-09-30 19:17:21 +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 |
|
MichalZr6
|
edf43f5702
|
Get and translate messages on client side
|
2024-09-24 19:12:05 +02:00 |
|
MichalZr6
|
303b0a6552
|
Fixes based on review remarks
|
2024-09-24 18:29:01 +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 |
|
Xilmi
|
ca4a46466b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-09-15 11:32:46 +02:00 |
|
Ivan Savenko
|
95df330843
|
Remove unused files
|
2024-09-14 10:47:43 +00:00 |
|
Tomasz Zieliński
|
2fe54504ab
|
Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone
# Conflicts:
# lib/rmg/CRmgTemplate.cpp
|
2024-09-14 10:19:22 +02:00 |
|
Tomasz Zieliński
|
9591ce1ab4
|
Move CompoundMapObjectID to separate file
|
2024-09-14 08:55:28 +02:00 |
|
Tomasz Zieliński
|
4b263b6d41
|
Add specific objects and configure their frequency / value
|
2024-09-12 21:04:27 +02:00 |
|
Xilmi
|
a1a03d4b74
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-09-12 14:54:39 +02:00 |
|
Ivan Savenko
|
2ee4e42348
|
Implement placeholders for creature banks messages
|
2024-09-12 12:11:18 +00:00 |
|
Ivan Savenko
|
39a2c29c97
|
Removed creatureBank flag from battle, battles now receive BattleLayout
struct that defines how units are placed in combat
|
2024-09-12 12:11:18 +00:00 |
|
Ivan Savenko
|
31dff8f8da
|
Add coastVisitable property to rewardables, update schemas
|
2024-09-12 12:11:18 +00:00 |
|
Ivan Savenko
|
503b87561e
|
Converted all h3 banks to rewardable, remove most of hardcoded checks
|
2024-09-12 12:11:18 +00:00 |
|
Ivan Savenko
|
cb5df096c1
|
Added per-team tracking of scouted state of an object
|
2024-09-12 12:11:17 +00:00 |
|
Ivan Savenko
|
785036836c
|
Rewardable objects may now define guards. Converted Crypt to rewardable.
|
2024-09-12 12:10:40 +00:00 |
|
Xilmi
|
065125e770
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-09-10 14:57:27 +02:00 |
|
Xilmi
|
d4ee899565
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-09-06 17:04:34 +02:00 |
|
Xilmi
|
581a142a20
|
HeroStrengthForCampaign
Make sure to take our magic-specialist to the next campaign-mission even if he's totally out of mana.
|
2024-09-05 17:38:27 +02:00 |
|
Ivan Savenko
|
8225eb454e
|
Added GameSettings to gamestate, potentially allowing to define game
settings per map (or in random map template)
|
2024-09-05 15:16:27 +00:00 |
|
Ivan Savenko
|
6179521364
|
Merge pull request #4556 from IvanSavenko/town_building_visit
Implemented explicitly visitable town buildings, e.g. hota mana vortex
|
2024-09-05 17:21:21 +03:00 |
|
Ivan Savenko
|
a72715ad31
|
Merge pull request #4563 from SoundSSGood/vcmiScrolls
Improvements to the artifact creation
|
2024-09-05 17:10:13 +03:00 |
|
Xilmi
|
dd5a34d994
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2024-09-05 15:54:03 +02:00 |
|
SoundSSGood
|
7466d7452d
|
vcmiscrolls
|
2024-09-05 15:51:45 +03:00 |
|
Ivan Savenko
|
44fdb71933
|
Machine Factory and Refugee Camp can't be owned
|
2024-09-04 19:46:58 +00:00 |
|
Ivan Savenko
|
dae9e1e316
|
Implement IOwnableObject interface for shipyard
|
2024-09-04 19:46:36 +00:00 |
|
SoundSSGood
|
30fa2846aa
|
ArtifactUtils::createArtifact ArtifactUtils::createNewArtifactInstance unified
|
2024-09-04 21:25:55 +03:00 |
|
Ivan Savenko
|
b09d9d501b
|
Pass pointer to actual caller in showBlockingDialog callWith
Fixes activation of all rewardable buildings in town on blocking dialog
answer
|
2024-09-04 15:14:56 +00:00 |
|