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

6640 Commits

Author SHA1 Message Date
Laserlicht
185d036d78 no scrollbar for hotseat title (with ttf fonts) 2024-10-20 03:16:57 +02:00
Laserlicht
98b912dab8 optimize layout 2024-10-20 02:26:40 +02:00
Laserlicht
94606ba5a3 campaign map description size 2024-10-20 02:13:50 +02:00
Laserlicht
2ea2a3150e fix shortcuts with Modifier Key 2024-10-19 15:59:02 +02:00
Laserlicht
59dae43a74
fix remembering last map 2024-10-17 02:12:41 +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
52e0899d6f
Merge pull request #4780 from Laserlicht/text_pos_fix
fix: campaign video scrolling for short texts
2024-10-15 18:01:52 +03:00
Ivan Savenko
c4e708831c
Merge pull request #4777 from Laserlicht/backround_voice
fix: lower background music while campaign audio plays
2024-10-15 18:01:17 +03:00
Ivan Savenko
da0ec2c607
Merge pull request #4776 from Laserlicht/audio_playback
fix: audio playback after using Back button
2024-10-15 18:00:44 +03:00
SoundSSGood
86d5c05ffa Fused identical artifacts 2024-10-15 16:51:29 +03:00
Laserlicht
d65938fa17 fix campaign video scrolling for short texts 2024-10-14 23:26:24 +02:00
Laserlicht
cb6fa74cc4 lower background music while campaign audio plays 2024-10-14 21:02:49 +02:00
Ivan Savenko
94a0de716a
Merge pull request #4772 from Laserlicht/mixer_audio_duration
fix: use sdl mixer to get audio duration
2024-10-14 21:51:49 +03:00
Laserlicht
b2da317906 fixes audio playback after using Back button 2024-10-14 20:26:31 +02:00
Laserlicht
9ed4dbaeb4 Merge remote-tracking branch 'upstream/develop' into adv_search 2024-10-14 19:52:55 +02:00
Laserlicht
3f59942b04 code review 2024-10-14 19:28:38 +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
cee3521f57
Merge pull request #4770 from IvanSavenko/prison_fix
Fix for loading hero types / identities
2024-10-14 18:16:53 +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
Laserlicht
d43997f5ba use sdl mixer to get audio duration 2024-10-13 21:08:43 +02: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
Ivan Savenko
184d8de82e Fix typo in assertion 2024-10-13 13:06:07 +00:00
Laserlicht
f7e3641c04 fix shortcut bug; add center of selected item 2024-10-12 23:21:26 +02:00
Laserlicht
11eaed9fef code review 2024-10-12 23:01:14 +02:00
SoundSSGood
d4d3ddf685 fused artifacts 2024-10-12 16:43:04 +03:00
Ivan Savenko
a8e84c55f6 Fix some of the new warnings from sonarcloud 2024-10-11 10:45:29 +00:00
Ivan Savenko
e0e01d678a
Merge pull request #4753 from IvanSavenko/misc_fixes
Fixes for regressions from recent PR's
2024-10-11 00:32:45 +03:00
Ivan Savenko
dfff1eae26 Fix crash on losing a hero 2024-10-10 21:16:41 +00:00
Laserlicht
f3a6d4a93f
copy name after init 2024-10-10 22:01: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