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

1328 Commits

Author SHA1 Message Date
Ivan Savenko
251155d913 More robust management of body/shadow/overlay split 2024-11-17 17:54:55 +00:00
Ivan Savenko
c82db9d574 Fix crash on rearranging troops on non-owned hero 2024-11-17 17:38:54 +00:00
Ivan Savenko
1a038b26ed
Merge pull request #4910 from Laserlicht/picture_regression
fix picture (regression)
2024-11-15 19:17:52 +02:00
Ivan Savenko
df0c53af41
Merge pull request #4864 from Laserlicht/creature_window_rework
Creature window rework
2024-11-15 19:13:58 +02:00
Laserlicht
ac12574f61
fix picture (regression) 2024-11-15 03:25:16 +01:00
Laserlicht
e73cb7f45b
Update client/windows/CCreatureWindow.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-11-13 20:03:20 +01:00
Ivan Savenko
46e492be01
Merge pull request #4891 from kdmcser/fix_research_spell_crash
fix spell research crash when no more spells can be researched
2024-11-13 20:50:24 +02:00
Ivan Savenko
1d0fdb1c0e
Merge pull request #4867 from Laserlicht/notFocusedClick
notFocusedClick refactoring
2024-11-13 20:49:31 +02:00
kdmcser
51e742f475 Merge branch 'develop' into fix_research_spell_crash 2024-11-10 23:32:33 +08:00
kdmcser
2621d4f5bf fix spell research crash when no more spells can be researched due to map limit 2024-11-10 23:02:36 +08:00
Ivan Savenko
da8fe13632
Merge pull request #4870 from SoundSSGood/secSkillPlace-fix
CHeroOverview secondary skill icons fixed
2024-11-06 22:02:28 +02:00
Ivan Savenko
92fc66d1c2
Merge pull request #4875 from Laserlicht/patch-3
8th creature fix
2024-11-06 22:02:06 +02:00
Ivan Savenko
e7bea6c3b8
Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization
Remove remaining pointers to VLC entities from serializer
2024-11-06 22:01:11 +02:00
SoundSSGood
fa9201831b QuickBackpack window position on shift+click slot fixed 2024-11-04 14:16:06 +02:00
Laserlicht
7a52d1d533
8th creature fix 2024-11-03 22:51:48 +01:00
SoundSSGood
f60813d86f CHeroOverview secondary skill icons fixed 2024-11-03 17:29:27 +02:00
Laserlicht
ca037aae33 notFocusedClick refactoring 2024-11-03 01:13:14 +01:00
Laserlicht
988d36bd13 sorted 2024-11-02 15:46:20 +01:00
Laserlicht
74b4fbfceb small fix 2024-11-02 15:19:39 +01:00
Laserlicht
0ab4b66026 better approach for scrollbar 2024-11-02 15:16:38 +01:00
Laserlicht
9009dffebd add "other" for bonus display 2024-11-02 14:51:33 +01:00
Laserlicht
17ee363d8d changed bonus source text pos 2024-11-02 14:37:21 +01:00
Laserlicht
5a72a65b31 add labels 2024-11-02 13:59:09 +01:00
Laserlicht
440e9a6575 assign colors for bonuses 2024-11-02 13:05:10 +01:00
Laserlicht
3038e5140a add color frames; remove scrollbar 2024-11-01 19:02:51 +01:00
kodobi
2678665f67 Resolve merge conflict 2024-10-30 18:48:09 +01:00
kodobi
44f479be89
Merge branch 'vcmi:develop' into bugfix/fix-ballista-damage-range-display 2024-10-30 18:41:29 +01:00
kodobi
0a0692061d Merge branch 'bugfix/fix-ballista-damage-range-display' of https://github.com/kodobi/vcmi into bugfix/fix-ballista-damage-range-display 2024-10-30 18:39:11 +01:00
kodobi
b82444ba43 Fix ballista damage range display
- Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3.
- Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.
2024-10-30 18:35:35 +01:00
Ivan Savenko
d3af9f1c67 Removed pointer to VLC entity from CStackBasicDescriptor 2024-10-30 16:47:02 +00:00
Ivan Savenko
c98ac01e7a Replaced public artType member of ArtifactInstance with getter 2024-10-30 16:47:01 +00:00
Ivan Savenko
08fbcd5239 TerrainTile now uses identifiers instead of pointers to VLC 2024-10-30 16:22:11 +00:00
Ivan Savenko
f8b1f40abb
Merge pull request #4348 from MichalZr6/hill_fort_changes
Hill Fort unavailable upgrade and status bar new messages
2024-10-30 14:00:35 +02:00
Ivan Savenko
f12119f86c
Merge pull request #4812 from SoundSSGood/secSkillPlace
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
kodobi
389f8b678b Fix ballista damage range display
- Adjusted the displayed damage range of ballista to reflect the changes in hero/es attack skill like in OH3.
- Added checks to ensure the battle interface and relevant heroes are valid before calculating damage.
- Correctly retrieve the ballista status from the hero's war machine slot.
2024-10-29 20:44:31 +01:00
SoundSSGood
1fcd750774 suggested changes 2024-10-28 21:58:35 +02:00
Ivan Savenko
a97deea563
Merge pull request #4824 from IvanSavenko/translate_fix
Fixes for issues with translations
2024-10-28 12:56:50 +02:00
Ivan Savenko
72b0062ae3 Better integration of wog commanders translation 2024-10-26 14:21:05 +00:00
Ivan Savenko
d1164ab9a9 Integrated exchange window translation into vcmi 2024-10-26 13:09:09 +00:00
Ivan Savenko
26fecbf2ca Simplify income calculation in kingdom overview, account for flaggables 2024-10-25 19:08:13 +00:00
SoundSSGood
83279211e6 CSecSkillPlace done 2024-10-23 15:01:56 +03:00
SoundSSGood
03b4733c64 CSecSkillPlace 2024-10-22 01:54:04 +03:00
SoundSSGood
573bb6abc6 CArtPlace now works with artifact ID 2024-10-20 12:56:54 +03:00
Laserlicht
9ed4dbaeb4 Merge remote-tracking branch 'upstream/develop' into adv_search 2024-10-14 19:52:55 +02: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
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
Laserlicht
f7e3641c04 fix shortcut bug; add center of selected item 2024-10-12 23:21:26 +02: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