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

6604 Commits

Author SHA1 Message Date
Xilmi
856e1f0ef8 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-10 22:51:25 +02:00
Xilmi
6adaffa2c2 Update SelectionTab.cpp
Fix for save-game-list having no names.
2024-10-10 18:52:25 +02:00
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
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
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