1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

1344 Commits

Author SHA1 Message Date
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
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
e442e71ed9 Fix handling of autoselected interface scaling by client 2024-10-09 17:37:54 +00:00
Ivan Savenko
a8f8c3f4b1 Replaced most of accesses to CGObjectInstance::pos with anchorPoint() 2024-10-09 15:43:46 +00:00
Ivan Savenko
9492eab7c5 Finish encapsulation of PlayerLocalState class 2024-10-08 14:17:04 +00:00
Laserlicht
2d4c0778b0 fix resource bar pos in kingdom overview 2024-10-07 18:29:54 +02:00
Laserlicht
72da365d24 center QuickRecruitmentWindow 2024-10-07 18:01:36 +02:00
Laserlicht
106dfdeb28 fix { and } in multiline 2024-10-07 18:01:20 +02:00
Laserlicht
758666d99d fix crash with 8th creature and portal of s. 2024-10-07 18:00:34 +02:00
Laserlicht
714de18615 fix 8th + portal of summoning in kingdom overview 2024-10-07 17:41:36 +02:00
Ivan Savenko
2a628994ea
Merge pull request #4734 from Laserlicht/fix_8th_and_portal_of_summoning
fix 8th creature and portal of summoning
2024-10-07 17:57:27 +03: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
613da80f55 fix 8th creature and portal of summoning 2024-10-07 16:25:18 +02:00
Laserlicht
b885fd9d3b added custom icons for buttons made by Ivan 2024-10-07 13:26:43 +02:00
Laserlicht
344e845684
Merge branch 'develop' into adv_search 2024-10-07 12:56:54 +02:00
Laserlicht
a826b88641
Merge branch 'develop' into spell 2024-10-07 12:55:23 +02:00
Laserlicht
4bf02865e4 tavern invite show random hero icon as default 2024-10-04 23:14:02 +02: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
8e079cf016 add search box 2024-10-01 22:53:05 +02:00
Laserlicht
07aa7bac3c search for texts 2024-10-01 21:19:42 +02: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
Laserlicht
31f87cb6ed improve ui 2024-09-30 18:15:13 +02: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
3813db83ab make ci happy 2024-09-28 16:16:34 +02:00
Laserlicht
8461189e95 code review + text 2024-09-28 16:10:03 +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
5bb29732d0 spell description, not spell roll 2024-09-28 12:53:57 +02:00
Laserlicht
afb90c076d better UI 2024-09-28 02:34:18 +02:00
Laserlicht
3559f9f923 HMI for spell research 2024-09-28 01:47:32 +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
c983aa3887
Merge pull request #4651 from Laserlicht/optimize_vid
optimize videowindow (black bg)
2024-09-27 18:50:49 +03:00
Ivan Savenko
dc45d82558
Merge pull request #4665 from SoundSSGood/quickbackpack-shift+click
QuickBackpack window is now accessible by shift-clicking
2024-09-27 18:49:23 +03:00
Ivan Savenko
bee2e7200c
Merge pull request #4664 from IvanSavenko/ttf_fonts
Integrate true type fonts into VCMI
2024-09-27 18:41:02 +03:00
MichalZr6
edf43f5702 Get and translate messages on client side 2024-09-24 19:12:05 +02:00
MichalZr6
6cf423d977 Fix Hill Fort upgrade logic when there are two levels
Fixes #2503
2024-09-24 18:29:01 +02:00
MichalZr6
303b0a6552 Fixes based on review remarks 2024-09-24 18:29:01 +02:00
MichalZr6
5c6abb30c6 Fix typo 2024-09-24 18:29:01 +02:00
MichalZr6
162e2ab22e Additional Wooden Hill Fort message
More verbose info-message for unavailable upgrades (creature levels 5 and higher). Some minor refactors.

Added other statusbar message if it's standard Hill Fort
2024-09-24 18:29:01 +02:00
SoundSSGood
f0a5bcfebb Quick backpack window on shift+click 2024-09-24 16:35:28 +03:00
Ivan Savenko
88f3e982e0
Merge pull request #4662 from Laserlicht/string_color
fixes string colorization bug
2024-09-24 16:29:41 +03:00
SoundSSGood
b9ae7f1138 CMap put move and remove artifact method 2024-09-23 23:30:38 +03:00
Laserlicht
bee5cd00cc also for color 2024-09-23 21:11:53 +02:00
Laserlicht
03d03491b5 fixes string colorisation bug 2024-09-23 21:07:00 +02:00
Ivan Savenko
248cff49a4 Moved fonts handling from Graphics to RenderHandler class 2024-09-23 15:43:11 +00:00
Ivan Savenko
3319be114f Fix line break position computation for text without spaces (Chinese) 2024-09-22 20:33:14 +00:00
Laserlicht
b7b4277043 fix for smaller window 2024-09-22 17:20:43 +02:00
Laserlicht
8907dc9362 improvement 2024-09-22 17:15:54 +02:00
Laserlicht
6a74b3d26c optimize videowindow (black bg) 2024-09-22 17:03:20 +02:00
Ivan Savenko
fb28de5beb
Merge pull request #4531 from Laserlicht/mouse_right_drag
map drag with right mouse
2024-09-19 16:42:33 +03:00
Ivan Savenko
e3d365262e
Merge pull request #4588 from Laserlicht/intro_video_rework
Intro video rework
2024-09-19 16:18:31 +03:00
Laserlicht
c884566c4f fix xbrz shadow 2024-09-17 23:58:56 +02:00
Ivan Savenko
8b2821456a Show generic dialog if building was already visited 2024-09-16 19:51:10 +00: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
Ivan Savenko
500d17a4a4
Merge pull request #4590 from Laserlicht/fix_kingdom
fix kingdom overview
2024-09-14 13:45:07 +03:00
Ivan Savenko
37d03bd9eb
Merge pull request #4587 from IvanSavenko/fix_hero_preview
Fix crash on accessing hero preview in map setup
2024-09-14 13:44:40 +03:00
Ivan Savenko
bc9937e72c Fix corrupted shadow on ship image in shipyard 2024-09-13 13:42:27 +00:00
Laserlicht
789dec0c82 fix kingdom overview 2024-09-13 01:44:11 +02:00
Laserlicht
e963550431 fix and no shadow 2024-09-13 00:03:25 +02:00
Laserlicht
16ae854f17 fix shadow 2024-09-12 23:49:57 +02:00
Laserlicht
21c3cf0960 rename and move window class 2024-09-12 23:35:21 +02:00
Laserlicht
2fbdeb3a5d skippable video intro 2024-09-12 23:23:00 +02:00
Laserlicht
822fa61bf2 intro rework 2024-09-12 22:28:45 +02:00
Ivan Savenko
e086ff12b8 Fix crash on accessing hero preview in map setup 2024-09-12 20:13:02 +00:00
Ivan Savenko
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
Ivan Savenko
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
Ivan Savenko
327ff01471 Implemented explicitly visitable town buildings, e.g. hota mana vortex
Added flag `manualHeroVisit` flag to town building. If this flag is set,
then building will only be activated on click and will not give its
effect on hero recrutiment, hero visit, or new day.

This allows implementing changes to Mana Vortex from HotA
2024-09-03 16:31:07 +00:00
Ivan Savenko
ed60387041 Try to fix string width computation rounding error 2024-09-02 22:08:59 +00:00
Ivan Savenko
71c7beb7a5
Merge pull request #4533 from IvanSavenko/town_growth
Change logic of neutral towns garrisons to match H3
2024-08-31 13:52:36 +03:00
Ivan Savenko
7f926fc30e
Merge pull request #4478 from Laserlicht/resource_generation
generate assets to file
2024-08-30 15:36:51 +03:00
Ivan Savenko
7064374d87 Fix visions not working for towns 2024-08-29 15:46:03 +00:00
Laserlicht
c6f0f8de03 generate assets only when necessary 2024-08-29 00:37:39 +02:00
Laserlicht
091523d67b
add missing event 2024-08-28 23:37:38 +02:00
Laserlicht
aa6cbdf13b make it also usable on android 2024-08-28 23:07:00 +02:00
Laserlicht
8f24778e9d config for right drag 2024-08-28 22:36:41 +02:00
Laserlicht
be7d27234f map drag with right mouse 2024-08-28 22:17:05 +02:00
Ivan Savenko
4c84379110 Open thieves guild if building provides corresponding bonus 2024-08-28 14:04:47 +00:00
Ivan Savenko
408a632002 Deprecate artifact-related building types 2024-08-28 13:50:08 +00:00
Ivan Savenko
55fd7bd7aa Thieves guild information level is now a bonus type 2024-08-28 13:50:07 +00:00