1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Commit Graph

1904 Commits

Author SHA1 Message Date
d4d3ddf685 fused artifacts 2024-10-12 16:43:04 +03:00
a8e84c55f6 Fix some of the new warnings from sonarcloud 2024-10-11 10:45:29 +00:00
61fba1fedd Merge remote-tracking branch 'upstream/develop' into develop 2024-10-10 17:23:39 +02:00
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
81f0222c68 Merge pull request #4741 from IvanSavenko/serialize_local_state
Serialize local state of player interface
2024-10-10 15:03:14 +03:00
5aebf287b9 Merge pull request #4735 from IvanSavenko/private_pos
Reduce usages of ambiguos CGObjectInstance::pos
2024-10-10 15:00:50 +03:00
a8f8c3f4b1 Replaced most of accesses to CGObjectInstance::pos with anchorPoint() 2024-10-09 15:43:46 +00:00
c4859d51d0 Changed Commander Resistance type from Dwarf to Golem
Only changed the bonus on level-ups
The starting bonus on level 1 needs to be changed in mods
2024-10-09 00:42:04 +02:00
679181c103 Implemented serialization of local player state in json form 2024-10-08 20:04:32 +00:00
9a40577994 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-08 16:15:22 +02:00
d0606d2dc9 Fix scripting build 2024-10-07 15:14:03 +00:00
c0f5c7c0ea Replace pointer with reference in pack apply functions 2024-10-07 14:59:46 +00:00
48fb58e7a0 Replace few more pointers with references, remove manual delete call 2024-10-07 14:59:14 +00:00
786f80871e Replace more usages of pointers to packs with references 2024-10-07 14:59:14 +00:00
ee831c06e7 Reduced usage of CPack, replaced with CPackForServer where applicable 2024-10-07 14:59:14 +00:00
c1c552d394 Replaced some of pointers to CPack's with references 2024-10-07 14:59:14 +00:00
f6f6f98580 Merge pull request #4699 from SoundSSGood/backpack-arts-sorting
Backpack artifacts sorting
2024-10-07 17:55:42 +03:00
a826b88641 Merge branch 'develop' into spell 2024-10-07 12:55:23 +02:00
371eac070f Fixes for player disconnection handling
- Fixed lack of notification if player disconnects via connection loss,
e.g. app crash / network going down
- Replaced notification via chat message with notification via info window
2024-10-04 12:48:50 +00:00
6c44354843 Update CGameHandler.cpp
Improve debugability with more helpful error-texts.
2024-10-04 11:49:20 +02:00
e6f4a63951 add sort buttons 2024-10-02 13:35:08 +03:00
e22d15b1d8 manageBackpackArtifacts 2024-10-02 12:45:50 +03:00
9c6bd20159 code review 2024-10-01 16:32:28 +02:00
cef7466c71 Merge pull request #4643 from SoundSSGood/CArtHandler-refactoring
CArtifactSet  tidy up
2024-10-01 16:26:32 +03:00
e2b49bbf79 fix condition 2024-09-30 02:46:45 +02:00
713fcd6543 research per day & seperate config 2024-09-30 02:40:28 +02:00
3bff68958e Change deleted objects format to use ObjectInstanceID 2024-09-28 22:58:05 +02:00
f94f0a3274 new dialog 2024-09-28 15:51:53 +02:00
d929bfb9d1 rename; introduce factor 2024-09-28 15:05:13 +02:00
2052a26031 code review 2024-09-28 14:25:11 +02:00
3559f9f923 HMI for spell research 2024-09-28 01:47:32 +02:00
7707adc44f checks on server 2024-09-28 01:18:10 +02:00
5b2aa4dc71 swapping spells 2024-09-28 00:34:25 +02:00
857b2e9a35 spell replacement works 2024-09-27 23:52:33 +02:00
a9327b3fa3 netpacks 2024-09-27 22:47:22 +02:00
f2c20b54d0 Unify rewardable map object and town building code 2024-09-27 15:41:24 +00:00
586a32a616 CArtifactSet cleanup 2024-09-23 23:39:19 +03:00
b9ae7f1138 CMap put move and remove artifact method 2024-09-23 23:30:38 +03:00
292f4c8ad2 Do not process pack if it was blocked by a queryReply
Regression from earlier PR
2024-09-19 16:45:13 +00:00
bff2e064fc Wait for queries generated by town building visit to end before visiting
next building
2024-09-16 19:32:39 +00:00
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
1e74216040 Merge pull request #4580 from IvanSavenko/crashfixes
Fixes for crashes caused by town building changes
2024-09-12 23:12:27 +03:00
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
76ee49f4ec Do not visit building on forced construction, e.g. from events 2024-09-11 16:08:49 +00:00
40dff8ac17 Fix town visit via Town Portal not generating town visit query 2024-09-11 16:08:26 +00:00
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
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
7466d7452d vcmiscrolls 2024-09-05 15:51:45 +03:00
30fa2846aa ArtifactUtils::createArtifact ArtifactUtils::createNewArtifactInstance unified 2024-09-04 21:25:55 +03:00
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