Ivan Savenko
d8d652783a
Fix crash on casting spell by a random spellcaster (e.g. Master Genie)
2024-10-02 11:04:40 +00:00
SoundSSGood
e6f4a63951
add sort buttons
2024-10-02 13:35:08 +03:00
SoundSSGood
e22d15b1d8
manageBackpackArtifacts
2024-10-02 12:45:50 +03: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
Ivan Savenko
9c91559414
Merge pull request #4677 from IvanSavenko/rewardable_fixes
...
Unify rewardable map object and town building code
2024-10-01 15:26:50 +03:00
Laserlicht
e2b49bbf79
fix condition
2024-09-30 02:46:45 +02:00
Laserlicht
713fcd6543
research per day & seperate config
2024-09-30 02:40:28 +02:00
Xilmi
58eeccd119
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-29 12:35:44 +02:00
Dydzio
3bff68958e
Change deleted objects format to use ObjectInstanceID
2024-09-28 22:58:05 +02:00
Dydzio
0589403ea3
Remove deleted objects from timed events data
2024-09-28 21:24:13 +02:00
Laserlicht
f94f0a3274
new dialog
2024-09-28 15:51:53 +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
3559f9f923
HMI for spell research
2024-09-28 01:47:32 +02:00
Laserlicht
7707adc44f
checks on server
2024-09-28 01:18:10 +02:00
Laserlicht
5b2aa4dc71
swapping spells
2024-09-28 00:34:25 +02:00
Dydzio
3fe90e19a5
Merge branch 'develop' into map-objects-removal-2
2024-09-28 00:08:59 +02:00
Laserlicht
857b2e9a35
spell replacement works
2024-09-27 23:52:33 +02:00
Laserlicht
a9327b3fa3
netpacks
2024-09-27 22:47:22 +02:00
Ivan Savenko
19db016473
Merge pull request #4654 from dydzio0614/any-hex-shooting
...
Allow targeting empty hex by shooters with multi-tile SPELL_LIKE_ABILITY
2024-09-27 19:23:33 +03:00
Ivan Savenko
69d9e34ebf
Merge pull request #4642 from Laserlicht/invincible_improvements
...
Invincible bonus: only blocking non positive spells; counterstrike
2024-09-27 18:58:00 +03:00
Ivan Savenko
f2c20b54d0
Unify rewardable map object and town building code
2024-09-27 15:41:24 +00:00
Dydzio
9004b88c7e
Mapping of deletable coordinates to objects on map start
2024-09-26 20:05:46 +02: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
Dydzio
cf5ce96aeb
Backend implementation of object removal possibility by timed map events
2024-09-23 21:45:50 +02:00
Ivan Savenko
a7cdeb723e
Fix blocking dialog handling in refusable rewardable town building
2024-09-23 13:00:02 +00:00
Dydzio
1a2d349267
Initial unconditionally working version
2024-09-22 15:07:44 +02:00
Xilmi
d679ee72b9
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-22 12:21:20 +02:00
Laserlicht
899d3a14a0
only blocking non positive spells; counterstrike
2024-09-21 23:50:35 +02:00
Ivan Savenko
292f4c8ad2
Do not process pack if it was blocked by a queryReply
...
Regression from earlier PR
2024-09-19 16:45:13 +00:00
Xilmi
7c8f4c423c
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-19 17:35:18 +02:00
Ivan Savenko
65355925e9
Merge pull request #4595 from Laserlicht/cast_without_skip
...
Bonus for spell: cast without skip the turn
2024-09-19 16:17:48 +03:00
Laserlicht
735af83294
castSpellThisTurn to bool var
2024-09-18 21:24:27 +02:00
Xilmi
27aed74397
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-18 14:52:24 +02:00
Ivan Savenko
72819d5fe3
Merge pull request #4608 from godric3/map-editor-fix-event-regressions
...
Map editor fix event regressions
2024-09-18 14:15:58 +03:00
Ivan Savenko
bff2e064fc
Wait for queries generated by town building visit to end before visiting
...
next building
2024-09-16 19:32:39 +00:00
godric3
8917c753bd
adjust town event handling after introducing 8th creature in town
2024-09-16 20:16:36 +02:00
Ivan Savenko
1d7a89c79b
Only visiting heroes can now activate manual rewardable buildings
...
- This is more clear - in case if building generates queries
- Avoids some edge cases, like what to do if building is single-use and
town has 2 heroes
- In line with hota version of this feature
2024-09-15 10:36:31 +00:00
Laserlicht
0aaafc4c8a
cast without skip
2024-09-14 15:10:24 +02:00
Xilmi
0d48b6fd19
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-12 23:48:12 +02:00
Ivan Savenko
1e74216040
Merge pull request #4580 from IvanSavenko/crashfixes
...
Fixes for crashes caused by town building changes
2024-09-12 23:12:27 +03:00
Xilmi
a1a03d4b74
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-12 14:54:39 +02: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
76ee49f4ec
Do not visit building on forced construction, e.g. from events
2024-09-11 16:08:49 +00:00
Ivan Savenko
40dff8ac17
Fix town visit via Town Portal not generating town visit query
2024-09-11 16:08:26 +00:00
Xilmi
065125e770
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-10 14:57:27 +02:00
