1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Commit Graph

2525 Commits

Author SHA1 Message Date
DjWarmonger
59a15c5ff0
Merge pull request #4790 from kodobi/bugfix/fix-incorrect-battlefield-while-attacking-town-without-fort
Fix battle setup for sieges without forts
2024-10-28 08:38:14 +01:00
kodobi
3c56769b2a
Update server/battles/BattleProcessor.cpp
Co-authored-by: Dydzio <dydzio0614@users.noreply.github.com>
2024-10-17 15:21:06 +02:00
kodobi
c576438a95 Fix battle setup for sieges without forts
- Update the if statement in BattleProcessor::SetupBattle to allow
  obstacles in battlefields during sieges without forts.
- Ensure towns without forts use the native battlegrounds.
- Refactor variable name from curB to currentBattle for clarity.
2024-10-17 14:54:01 +02:00
Ivan Savenko
c25aef8f48
Merge pull request #4766 from SoundSSGood/fused-artifacts
Fused artifacts
2024-10-16 15:08:20 +03: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
678e6b47f8
Merge pull request #4756 from IvanSavenko/sonar_fixes
Fix some of the new warnings from sonarcloud
2024-10-14 18:16:41 +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
SoundSSGood
d4d3ddf685 fused artifacts 2024-10-12 16:43:04 +03:00
Ivan Savenko
115439f16a Fix town events not actually giving offered creatures 2024-10-11 15:01:18 +00:00
Ivan Savenko
a8e84c55f6 Fix some of the new warnings from sonarcloud 2024-10-11 10:45:29 +00: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
81f0222c68
Merge pull request #4741 from IvanSavenko/serialize_local_state
Serialize local state of player interface
2024-10-10 15:03:14 +03:00
Ivan Savenko
5aebf287b9
Merge pull request #4735 from IvanSavenko/private_pos
Reduce usages of ambiguos CGObjectInstance::pos
2024-10-10 15:00:50 +03:00
Ivan Savenko
a8f8c3f4b1 Replaced most of accesses to CGObjectInstance::pos with anchorPoint() 2024-10-09 15:43:46 +00:00
Warzyw647
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
Ivan Savenko
679181c103 Implemented serialization of local player state in json form 2024-10-08 20:04:32 +00:00
Ivan Savenko
d0606d2dc9 Fix scripting build 2024-10-07 15:14:03 +00:00
Ivan Savenko
c0f5c7c0ea Replace pointer with reference in pack apply functions 2024-10-07 14:59:46 +00:00
Ivan Savenko
48fb58e7a0 Replace few more pointers with references, remove manual delete call 2024-10-07 14:59:14 +00:00
Ivan Savenko
786f80871e Replace more usages of pointers to packs with references 2024-10-07 14:59:14 +00:00
Ivan Savenko
ee831c06e7 Reduced usage of CPack, replaced with CPackForServer where applicable 2024-10-07 14:59:14 +00:00
Ivan Savenko
c1c552d394 Replaced some of pointers to CPack's with references 2024-10-07 14:59:14 +00:00
Ivan Savenko
cc6d6b0d63 Replaced unique_ptr with simple references to packs 2024-10-07 14:59:14 +00:00
Ivan Savenko
f6f6f98580
Merge pull request #4699 from SoundSSGood/backpack-arts-sorting
Backpack artifacts sorting
2024-10-07 17:55:42 +03:00
Laserlicht
a826b88641
Merge branch 'develop' into spell 2024-10-07 12:55:23 +02:00
Ivan Savenko
f3af32b912
Merge pull request #4709 from IvanSavenko/genie_fix
Fix crash on casting spell by a random spellcaster (e.g. Master Genie)
2024-10-06 16:00:00 +03:00
Ivan Savenko
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
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
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
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
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
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
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