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

1816 Commits

Author SHA1 Message Date
7be44278d7 Merge pull request #4892 from SoundSSGood/artifact-related-fixes
Artifact related fixes
2024-11-13 20:58:37 +02:00
ef46a87e69 ask assemble artifact dialog fix 2024-11-10 16:50:58 +02:00
77d14d095f delete error message since grail will go to last branch 2024-11-10 10:52:00 +08:00
e12b72a839 merge changes 2024-11-09 17:37:06 +08:00
5f4a5228ce Merge branch 'develop' into artifact_sort_fix 2024-11-09 17:34:43 +08:00
8d58066f69 fix artifact sort by slot crash 2024-11-09 17:24:14 +08:00
17dd8ffb48 fix artifact sort by slot crash 2024-11-09 16:54:47 +08:00
a39469d165 Add save compatibility 2024-10-30 16:57:03 +00:00
01d787fb5a Removed remaining cases of serialization of VLC entities 2024-10-30 16:48:18 +00:00
d3af9f1c67 Removed pointer to VLC entity from CStackBasicDescriptor 2024-10-30 16:47:02 +00:00
c98ac01e7a Replaced public artType member of ArtifactInstance with getter 2024-10-30 16:47:01 +00:00
04ca8aca9f Update tests 2024-10-30 16:22:12 +00:00
08fbcd5239 TerrainTile now uses identifiers instead of pointers to VLC 2024-10-30 16:22:11 +00:00
c25aef8f48 Merge pull request #4766 from SoundSSGood/fused-artifacts
Fused artifacts
2024-10-16 15:08:20 +03:00
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
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
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
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
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
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
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