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

6666 Commits

Author SHA1 Message Date
Ivan Savenko
341ef633a5 Fixes missing names of saves and custom campaigns 2024-10-10 16:05:50 +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
3113b7f60a
Merge pull request #4704 from IvanSavenko/video_autodetect
Enable autodetection of video scaling parameters
2024-10-10 15:00:40 +03:00
Ivan Savenko
7f6a80ed47
Merge pull request #4738 from IvanSavenko/external_audio
Loading separate audio file in place of audio stream embedded in video
2024-10-10 14:58:04 +03:00
Ivan Savenko
28bc38c94f
Merge branch 'develop' into multiple_small_fixes 2024-10-10 14:57:30 +03:00
Laserlicht
598b2fb6c1 show folder cases; translate new game 2024-10-10 00:06:34 +02:00
Ivan Savenko
e442e71ed9 Fix handling of autoselected interface scaling by client 2024-10-09 17:37:54 +00:00
Ivan Savenko
68e5cff276 Implement user-defined cursor scaling 2024-10-09 17:37:54 +00:00
Ivan Savenko
58d13fdce5 Implemented scaling of hardware cursor 2024-10-09 17:37:54 +00:00
Ivan Savenko
42adc9d394 Enable auto-detection of UI scaling 2024-10-09 17:37:54 +00:00
Ivan Savenko
0c03e0b7c7 Enable autodetection of upscaling filter 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
679181c103 Implemented serialization of local player state in json form 2024-10-08 20:04:32 +00:00
Ivan Savenko
9492eab7c5 Finish encapsulation of PlayerLocalState class 2024-10-08 14:17:04 +00:00
Laserlicht
f7039435da fix vmap name 2024-10-07 22:55:48 +02:00
Ivan Savenko
9977092cf4 Loading separate audio file in place of audio stream embedded in video 2024-10-07 20:05:45 +00:00
Ivan Savenko
7694e2da4b
Merge pull request #4736 from Laserlicht/fix_8th_portal_summoning
Fix multiple small issues
2024-10-07 22:19:17 +03:00
Laserlicht
9e67e9616b Center "Human or CPU" 2024-10-07 19:05:07 +02:00
Laserlicht
a168b3aeaa remove unused var 2024-10-07 18:49:55 +02:00
Laserlicht
1c6eaf6336 fix player translation 2024-10-07 18:37:07 +02:00
Laserlicht
2d4c0778b0 fix resource bar pos in kingdom overview 2024-10-07 18:29:54 +02:00
Laserlicht
cc480e6e46 textsize and textposition in OptionsTab 2024-10-07 18:20:18 +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
c0f5c7c0ea Replace pointer with reference in pack apply functions 2024-10-07 14:59:46 +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
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
Ivan Savenko
a7027e10f4
Merge pull request #4696 from Laserlicht/color_param
color shift parameter to config
2024-10-06 16:03:45 +03:00
Ivan Savenko
ac5efaaf75
Merge pull request #4703 from IvanSavenko/swresample
Use swresample (part of FFmpeg) to de-planarize audio into format that can be consumed by SDL
2024-10-06 16:03:15 +03: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
a4b60aca10 cleanup 2024-10-01 23:37:27 +02:00
Laserlicht
8e079cf016 add search box 2024-10-01 22:53:05 +02:00
Laserlicht
e86b694b22 fast search 2024-10-01 21:36:45 +02:00
Laserlicht
07aa7bac3c search for texts 2024-10-01 21:19:42 +02:00
Laserlicht
e85e938865 use subid 2024-10-01 20:44:08 +02:00
Laserlicht
bd58caac13 search feature working 2024-10-01 20:20:19 +02:00
Laserlicht
5ea9063a3b search with CObjectListWindow 2024-10-01 19:47:10 +02:00
Laserlicht
d04f369d85 search basic implementation 2024-10-01 18:15:32 +02:00
Ivan Savenko
e497a51373 Use swresample (part of FFmpeg) to de-planarize audio into format that
can be consumed by SDL
2024-10-01 15:38:15 +00:00
Laserlicht
9c6bd20159 code review 2024-10-01 16:32:28 +02:00
Laserlicht
be31041a48
"general" -> "interface" 2024-10-01 16:09:22 +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
654f5a9100
Merge pull request #4691 from PolishUser/hero-recruitment-sound
Add 'newBuilding' sound upon hero recruitment in towns
2024-10-01 15:28:33 +03:00
Laserlicht
844b078482 color shift parameter to config 2024-09-30 19:46:53 +02: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
PolishUser
c2ddf8e06a Add 'newBuilding' sound upon hero recruitment in towns 2024-09-28 23:54:51 +02:00
Ivan Savenko
4ed478b6e5 Improve font mode auto-selection for languages like Chinese 2024-09-28 19:31:16 +00:00
Ivan Savenko
fecfdd7056 Fix centering of multi-line labels 2024-09-28 19:30:50 +00:00
Ivan Savenko
51848ced3b Add font loading tracking to log 2024-09-28 19:30:26 +00: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
7f8f09c8fa
Merge pull request #4668 from Laserlicht/scenario_name
Chronicles improvements
2024-09-27 20:01:47 +03: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
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
Ivan Savenko
ff50536568 Fix positioning of stack amount text 2024-09-27 12:05:26 +00:00
Laserlicht
2d60252e4c read from mapheader; move chr to subfolder 2024-09-24 21:41:37 +02: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
Ivan Savenko
b624069f86 Fix CI 2024-09-24 13:40:15 +00: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
Ivan Savenko
ca3c6227c4 Add selector for font type in Launcher, add autoselection 2024-09-24 13:25:36 +00:00
Ivan Savenko
87274128e7 Proper support for usage of multiple fonts in a chain 2024-09-24 10:59:35 +00:00
Laserlicht
138cbc6a81 scenario name for campaigns 2024-09-24 11:23:10 +02: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
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
557b72f2b3 Launcher now controls ttf fonts usage directly instead of toggling mod
from extras
2024-09-23 18:31:44 +00:00
Ivan Savenko
97e24ff126 Integrated Noto fonts into vcmi 2024-09-23 18:15:30 +00:00
Ivan Savenko
5502dcaea4 Remove no longer used support for original version of Chinese fonts 2024-09-23 15:46:12 +00:00