Ivan Savenko
af5572db15
Merge pull request #4157 from IvanSavenko/bugfixing
...
[1.5.3] Bugfixing
2024-06-18 12:14:43 +03:00
Ivan Savenko
c9ba006445
Merge pull request #4156 from IvanSavenko/crashfixes
...
[1.5.3] Crashfixes
2024-06-18 12:14:06 +03:00
Ivan Savenko
6a0768aae6
Fix allied towns missing from town portal dialog
2024-06-17 20:46:47 +00:00
Ivan Savenko
0af2f6d8dc
Fix crash on opening tavern window on some localizations
2024-06-17 17:09:42 +00:00
Ivan Savenko
dd045e2dc7
Fix crash on transparency test on null surface
2024-06-17 17:09:19 +00:00
Ivan Savenko
ffa5c03515
Load & decode high score creatures on first access
2024-06-17 17:08:41 +00:00
Ivan Savenko
e08f76ddf0
Add missing lock to Android shutdown logic
2024-06-17 16:17:01 +00:00
Ivan Savenko
4f64b1f7e6
Try to localize crash on missing combat animation
2024-06-17 13:24:07 +00:00
Ivan Savenko
6b9d2809b1
Fix crash on Android OS shutdown request
2024-06-17 13:23:44 +00:00
Ivan Savenko
5b0b1ad7f7
Update texture while UI is locked to avoid concurrent accesses to pixel
...
data if netpack applier causes redraw
2024-06-12 18:12:03 +00:00
Ivan Savenko
b4c6906471
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-06-11 19:22:23 +00:00
Ivan Savenko
0a03b333f0
Hero backpack can now be scrolled via mouse wheel / swipe
2024-06-11 17:14:14 +00:00
Ivan Savenko
fc1a20239e
Swapped functions of Ctrl and Shift on adventure map
2024-06-11 17:14:06 +00:00
Ivan Savenko
9c05e80315
Fix Admiral's Hat whirlpool immunity. Reduce usage of
...
convertFromVisitablePos
2024-06-11 14:31:11 +00:00
Ivan Savenko
6a624cbaf7
Add more symbols to illegal for filenames
2024-06-11 14:30:13 +00:00
Ivan Savenko
f03d80628a
Fix potentially uninitialized pointer
2024-06-11 14:12:03 +00:00
Ivan Savenko
7ebc3bc6a5
Added controller sensitivity option, merged cursor options
2024-06-08 15:31:40 +00:00
Ivan Savenko
569d99a01f
Merge pull request #4101 from IvanSavenko/memory_usage_fix
...
[1.5.3] Reduce memory usage of adventure map
2024-06-08 13:46:48 +03:00
Andrey Filipenkov
8cee8b72a6
[launcher] build for Android
...
also embeds icons and translations as Qt resources instead of reading from disk
2024-06-08 00:09:04 +03:00
Ivan Savenko
4787965cec
Reduce memory usage of adventure map
2024-06-06 16:11:01 +00:00
Ivan Savenko
861ed7667d
Merge pull request #4095 from vcmi/master
...
Merge master -> beta
2024-06-05 23:54:21 +03:00
Ivan Savenko
a8dcbd8ff9
Merge pull request #4061 from Laserlicht/hota_buildings
...
Support HotA thives guild
2024-06-05 12:41:35 +03:00
SoundSSGood
a7239a6fcc
fix
2024-06-05 09:52:16 +03:00
Ivan Savenko
6c25552f84
Fix crash on closing game with open levelup dialog
2024-06-04 19:16:05 +00:00
Ivan Savenko
2288acef69
Merge pull request #4083 from IvanSavenko/recruitment_fix
...
[1.6] Fixes crash on accessing recruitment window via click on creature icon
2024-06-04 17:53:53 +03:00
Ivan Savenko
b92f0c5619
Fix UI glitch due slots recreation & repositioning
2024-06-04 14:41:33 +00:00
Ivan Savenko
56ee3713fe
Pressing shift will now add tile coordinates to adventure map hover text
2024-06-04 14:11:53 +00:00
Ivan Savenko
16c7063eb4
Add '*' to list of characters banned for save game names
2024-06-04 14:11:22 +00:00
Ivan Savenko
62dd5681f5
Fixes crash on accessing recruitment window via click on creature icon
2024-06-03 13:37:35 +00:00
Ivan Savenko
d462937572
Clarified & simplified ffmpeg decoding loop
2024-06-01 11:48:54 +00:00
Ivan Savenko
b8beb4fb13
Fixes for various minor issues detected by Sonar Cloud
2024-06-01 11:48:30 +00:00
Ivan Savenko
6b336b454e
Less ambiguous names for buttons in exchange window. Fixes swapped
...
button functions.
2024-06-01 07:39:43 +00:00
Ivan Savenko
54216bc313
Fix tactics shortcut not blocked after tactics is over
2024-06-01 07:38:49 +00:00
Ivan Savenko
df83fa33a1
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-05-31 09:34:21 +00:00
Ivan Savenko
adc3441bda
Merge pull request #3998 from IvanSavenko/refactor_sdl_media
...
[1.6] Reorganize SDL sound/music/video handling
2024-05-31 12:02:55 +03:00
Laserlicht
9c1ce214fc
thievesGuild support
2024-05-30 21:58:35 +02:00
Ivan Savenko
37e196c565
Automatically select preferred audio stream when playing video
2024-05-30 18:02:50 +00:00
Ivan Savenko
3ed7c1d066
Implement playback of two-part campaign videos
2024-05-30 18:02:19 +00:00
Ivan Savenko
5d6470e527
Merge pull request #4025 from IvanSavenko/shared_ptr_lib
...
[1.6] Use shared_ptr for library entities
2024-05-30 19:14:06 +03:00
Ivan Savenko
5ecb527252
Merge pull request #3997 from IvanSavenko/serialization_refactor
...
[1.6] Serialization refactor
2024-05-30 19:13:21 +03:00
Ivan Savenko
9e0bae96cc
Merge pull request #3895 from SoundSSGood/CWindowWithArtifacts-refactoring2
...
CWindowWithArtifacts refactoring part2
2024-05-30 19:12:39 +03:00
Ivan Savenko
888149c6f6
Implemented simple versioning system for multiplayer
2024-05-29 20:08:32 +00:00
Ivan Savenko
dd2d0e285d
Merge pull request #4038 from IvanSavenko/pathfinder_fixes
...
[1.5.2] Pathfinder fixes
2024-05-29 18:15:51 +03:00
Ivan Savenko
2fcbfd978a
Merge pull request #4049 from IvanSavenko/campaign_fix
...
[1.5.2] Campaign fixes
2024-05-29 18:14:04 +03:00
Ivan Savenko
d8f48f2c59
Merge pull request #4035 from IvanSavenko/stabilization
...
[1.5.2] Fixes for crashes in 1.5.1
2024-05-28 22:59:55 +03:00
Ivan Savenko
ecd117c542
Merge pull request #4037 from IvanSavenko/end_turn_shortcut_fix
...
Fix end turn button not assigned to shortcut
2024-05-28 20:06:20 +03:00
Ivan Savenko
a092760237
Fix freeze on attempt to load campaign save list
2024-05-28 16:00:52 +00:00
Ivan Savenko
985adbe07b
Merge pull request #4028 from SoundSSGood/artifacts-parts-calc
...
Parts calculation for combined artifacts
2024-05-28 16:48:01 +03:00
Ivan Savenko
7f5fe99d96
Merge pull request #4027 from IvanSavenko/show_mp_saves_in_sp
...
[1.5.2] Show multiplayer saves in singleplayer mode
2024-05-28 16:45:54 +03:00
SoundSSGood
07239dcfb5
artifact parts calc
2024-05-24 21:22:08 +02:00
Ivan Savenko
3fdbc09986
Use same arrows for U-turns in UI as in H3
2024-05-23 19:01:30 +00:00
Ivan Savenko
9e5f9a88c3
Fix renamed end turn shortcut
2024-05-23 18:49:06 +00:00
Ivan Savenko
949c0cff70
Fixed F4 (fullscreen hotkey) not actually changing window mode
2024-05-23 14:54:13 +00:00
Ivan Savenko
2aec3cde2c
Fix possible crash on replaying combat after manual run
2024-05-23 12:46:28 +00:00
Ivan Savenko
6d01b6d7c9
Show multiplayer saves in singleplayer mode
2024-05-21 15:15:18 +00:00
Ivan Savenko
d1aa4ecd10
Merge pull request #4013 from IvanSavenko/shortcuts_additions
...
[1.5.2] Shortcuts additions
2024-05-21 14:18:55 +03:00
SoundSSGood
3692ca25ed
CArtifactsOfHeroBase refactoring
2024-05-21 12:05:07 +03:00
Ivan Savenko
82af0639df
Merge pull request #4004 from Laserlicht/background
...
[1.5.2] background for multiple windows
2024-05-20 18:10:38 +03:00
Ivan Savenko
ffe14fc1fc
Merge pull request #4022 from vcmi/master
...
Merge master -> beta
2024-05-20 18:09:51 +03:00
SoundSSGood
03aaf849f0
CWindowWithArtifacts remove std::variant
2024-05-20 15:15:46 +03:00
Ivan Savenko
017aaefc40
Handle invalid main menu config
2024-05-20 11:00:21 +00:00
Ivan Savenko
d6ff7896fe
Fix possible crash on closing game from main menu
2024-05-20 10:57:25 +00:00
SoundSSGood
0501073d4c
Artifacts altar ctrl+click
2024-05-20 11:47:12 +03:00
Ivan Savenko
8931121d2e
Merge pull request #3995 from IvanSavenko/old_projects_remove
...
[1.6] Remove old project files
2024-05-19 15:44:32 +03:00
Ivan Savenko
d5f32c27b0
Merge pull request #3996 from IvanSavenko/retaliation_tweaks
...
[1.5.2] Retaliation preview tweaks
2024-05-19 15:44:16 +03:00
Ivan Savenko
9ed749e104
Merge pull request #3991 from Laserlicht/preselect_last_save_while_loading
...
[1.5.2] preselect last save in loading screen
2024-05-19 15:42:59 +03:00
Ivan Savenko
68883e0b29
Fixed disabling of text input on closing high scores
2024-05-19 12:39:59 +00:00
Ivan Savenko
5feef488e3
Added Ctrl & Shift versions for swap artifacts shortcut. Exchange window
...
shortcuts now work even without vcmi extras
2024-05-19 12:28:03 +00:00
Ivan Savenko
d965226cbd
Moved Exchange Window to new file, no functionality changes
2024-05-19 10:53:56 +00:00
Ivan Savenko
0d6d6fca03
Add detection of missing shortcuts
2024-05-19 09:59:12 +00:00
Ivan Savenko
16f963bed5
Fix zooming with keyboard shortcuts
2024-05-19 09:58:55 +00:00
Ivan Savenko
11c00711f9
Add string ID's for all new shortcuts
2024-05-19 09:12:36 +00:00
Ivan Savenko
6ba36cf6c0
Add separate shortcuts for adventure map and settings window
2024-05-19 09:12:36 +00:00
Ivan Savenko
dd337dba7b
Fixed Puzzle Map hotkey not working due to having inactive button in
...
world view mode
2024-05-19 09:12:36 +00:00
Ivan Savenko
0db8266495
Implemented some of the requested shortcuts
2024-05-19 09:12:36 +00:00
Ivan Savenko
88fbb7ee71
Most of buttons created in cpp now have assigned shortcut
2024-05-19 09:12:36 +00:00
Laserlicht
c676b999e5
use showAll
2024-05-18 20:21:47 +02:00
Laserlicht
fc50482b43
background for multiple windows
2024-05-18 19:58:51 +02:00
Ivan Savenko
947d07faa4
Add separate shortcuts for saving and loading of artifact costumes
2024-05-18 16:27:42 +00:00
Ivan Savenko
dc0b90e755
Code style & formatting
2024-05-18 13:34:23 +00:00
Ivan Savenko
d502850054
Add network thread termination logic for adventure map animations
2024-05-18 12:15:48 +00:00
Ivan Savenko
9bfe000724
Added semi-workaround method for network thread shutdown:
...
Currently closing game while network thread is waiting for something is
very bug-prone, since network thread may resume during shutdown and
access partially destroyed client state.
Now if exit has been requested, the very first step would be semi-
graceful shutdown of network thread (via exception throwing). This may
in theory skip some cleanup in non-RAII code, but since game is shutting
down this does not matters much.
This logic applies to:
- shutting down while network thread is waiting for dialogs
- shuttind down while network thread waiting for animations in combat
2024-05-18 11:04:10 +00:00
Ivan Savenko
8754e0ebb3
Code formatting and cleanup
2024-05-17 17:10:29 +00:00
Ivan Savenko
f3de2cfe1c
Removed broken & unused serialization of player interface and AI
2024-05-17 16:35:53 +00:00
Ivan Savenko
31349f3052
Fix handling of missing video files
2024-05-17 15:43:21 +00:00
Ivan Savenko
7461df161c
lib now uses shared_ptr for entities. Removed manual memory management.
2024-05-17 15:04:05 +00:00
Ivan Savenko
85d8e093df
Battle console: attempt to re-split string if it is too long to fit into
...
two lines due to line break
2024-05-17 12:22:21 +00:00
SoundSSGood
09bb9895ce
refactoring
2024-05-17 14:59:54 +03:00
SoundSSGood
6a1a6b6864
weak_ptr removed
2024-05-17 14:59:54 +03:00
SoundSSGood
7abfa7b42a
ArtifactPosition::TRANSITION_POS now is simple ArtSlotInfo
2024-05-17 14:59:51 +03:00
Ivan Savenko
eb67e04ccb
Remove old and unmaintained codeblocks project
2024-05-17 10:44:57 +00:00
Ivan Savenko
3f6eb13ee0
Delete old and unmaintained msvc project files
2024-05-17 10:44:11 +00:00
Ivan Savenko
721b15d9de
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-05-17 08:26:37 +00:00
Ivan Savenko
07813c9a79
Removed non-functional updateEntity in VLC
2024-05-16 22:05:26 +00:00
Ivan Savenko
540bd16e7b
Fixed video widget playback
2024-05-16 16:50:36 +00:00
Laserlicht
359503f878
preselect last save in loading screen
2024-05-16 13:16:14 +02:00
Laserlicht
eb96f42ba0
fixes graphical glitch when there is no savegame
2024-05-15 21:07:47 +02:00
Ivan Savenko
02da800151
Formatting
2024-05-15 17:05:17 +00:00
Ivan Savenko
e39461165a
Added better workaround for planar audio format from ffmpeg
2024-05-15 17:05:17 +00:00
Ivan Savenko
2ef3e5e2f1
Removed duplicated switches
2024-05-15 17:05:17 +00:00
Ivan Savenko
75941a6869
Unified audio and video handling of ffmpeg
2024-05-15 17:05:17 +00:00
Ivan Savenko
3f8781db69
Fixed sound extraction, slightly better approach to ffmpeg
2024-05-15 17:05:17 +00:00
Ivan Savenko
8e78e3bfb5
Use RGB texture for videos where this format is better than YUV
2024-05-15 17:05:17 +00:00
Ivan Savenko
7ad64207ed
Prefer high-quality bik's to smk's
2024-05-15 17:05:17 +00:00
Ivan Savenko
661a66121b
Cleaned up IVideoPlayed API to remove global state
2024-05-15 17:05:17 +00:00
Ivan Savenko
d08c7b7b8f
Added VideoWidget to hide implementation details
2024-05-15 17:05:16 +00:00
Ivan Savenko
d27b854cb1
Reorganized music, video and sound players:
...
- All XXXplayers are now in client/media directory
- Reogranized code on one class per file basis
- Extracted interfaces from handlers. Handlers now implement
corresponding interface.
- CCS now only stores pointer to an interface
2024-05-15 17:05:12 +00:00
Ivan Savenko
0ab23c68f6
Deactivate on-screen keyboard if input is deactivated
2024-05-15 12:55:36 +00:00
Ivan Savenko
bbdd2ffb37
Force-show on-screen keyboard when clicking on active status bar
2024-05-15 12:45:45 +00:00
Ivan Savenko
fe4b4a4fba
Hopefully better logic for on-screen keyboard visibility
2024-05-15 12:45:45 +00:00
Ivan Savenko
533b26f23b
Fix build
2024-05-15 12:45:45 +00:00
Ivan Savenko
d374cec6fb
Force-show on-screen keyboard if player closed it before
2024-05-15 12:45:45 +00:00
Ivan Savenko
7790b8969d
Simplify TextInput constructor
2024-05-15 12:45:45 +00:00
Ivan Savenko
93c3cf372b
Reworked TextInput to allow text overflow support
2024-05-15 12:45:45 +00:00
Ivan Savenko
1abe9007bc
Moved CTextInput to a separate file. No changes in logic
2024-05-15 12:45:45 +00:00
Ivan Savenko
1b1f724de1
Merge pull request #3970 from Laserlicht/extra
...
ExtraOptions improvements
2024-05-15 15:20:59 +03:00
Ivan Savenko
94d5dc1d7b
Merge pull request #3971 from Laserlicht/battle_log
...
battle log as window
2024-05-15 13:16:33 +03:00
Ivan Savenko
eb6e42c780
Merge pull request #3974 from IvanSavenko/hotfix_compat
...
Relax vcmi version compatibility checks in lobby
2024-05-15 13:15:35 +03:00
Laserlicht
79206ce65b
fix hotseat hide
2024-05-14 22:25:10 +02:00
Ivan Savenko
aa575c9093
Allow joining game hosted by other vcmi versions if only patch version
...
is different
2024-05-14 14:12:01 +00:00
Ivan Savenko
da9d82b697
Merge pull request #3973 from vcmi/master
...
Merge master -> beta
2024-05-14 16:59:10 +03:00
Ivan Savenko
22d51bd473
Fix freeze on closing game window while in game
2024-05-14 12:32:22 +00:00
Laserlicht
f596fbc9b3
Apply suggestions from code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-05-14 12:44:08 +02:00
Ivan Savenko
c92a5bbbab
Attempt to track crashes with unclear cause
2024-05-14 09:44:40 +00:00
Ivan Savenko
f061f98ddd
Merge pull request #3959 from IvanSavenko/fix_mac_hotkeys
...
Better handling of Ctrl / Cmd modifier keys on Apple systems
2024-05-14 12:16:55 +03:00
Laserlicht
e06c09d709
battle log expansion
2024-05-14 02:50:57 +02:00
Laserlicht
07a06ea08a
block for guests
2024-05-14 00:49:33 +02:00
Laserlicht
941c1576c5
improve extraoptions
2024-05-14 00:33:30 +02:00
Ivan Savenko
4787b9eded
Block movement if first node in path needs more move points that we have
2024-05-13 17:25:20 +00:00
Ivan Savenko
f8e4e41c39
Fix possible thread race on server shutdown:
...
- Main thread shutting down server from player request
- Network thread shutting down server due to server shutting down
network
2024-05-13 16:00:19 +00:00
Ivan Savenko
d295784f6e
Shutdown server immediately without leaving hanging server in main menu
2024-05-13 15:43:05 +00:00
Ivan Savenko
93da58beed
Do not use locks on single-threaded server.
...
Especially since this lock is global and is shared between client and
server for no reason
2024-05-13 15:42:33 +00:00
Ivan Savenko
95d761bbb8
Handle corrupted H3 data - show message box instead of silent crash
2024-05-13 15:41:47 +00:00
Ivan Savenko
876fe9adae
Fix size of invite window
2024-05-13 14:14:05 +00:00
Ivan Savenko
93038b791e
Fix connection termination handling
2024-05-13 14:09:59 +00:00
Ivan Savenko
2bb96018b8
Update list of player in invite window on new player or new invite
2024-05-13 13:48:01 +00:00
Ivan Savenko
7188849aa4
Show active room invites and invited players in UI
2024-05-13 12:12:55 +00:00
Ivan Savenko
a4ea74fbbc
Send list of active invites as part of room description
2024-05-13 11:43:28 +00:00
Ivan Savenko
58d1c93c1b
Merge pull request #3931 from IvanSavenko/retaliation_preview
...
[1.5.1] Retaliation preview
2024-05-13 14:40:00 +03:00
Ivan Savenko
c898d16458
Merge pull request #3948 from IvanSavenko/lobby_ui_fix
...
[1.5.1] Fixes for lobby UI
2024-05-13 14:39:53 +03:00
Ivan Savenko
0aa7362adf
Fix possible crash on accessing faction description
2024-05-12 20:24:09 +00:00
Ivan Savenko
7267e02b8d
Better handling of Ctrl / Cmd modifier keys on Apple systems:
...
- Test only for Cmd modifier key when processing mouse clicks
- Test both Ctrl and Cmd modifier key when processing keyboard input
- This logic is now used for all Apple systems - macOS and iOS
2024-05-12 17:09:31 +00:00
Ivan Savenko
f55d07a829
Fix not visible text after switching to channel without slider in log
2024-05-11 20:53:39 +00:00
Ivan Savenko
890e794e32
Only play chat sound for messages from current room or in private
2024-05-11 20:42:39 +00:00
Ivan Savenko
793a17f95d
Automatically scroll to end on new chat message
2024-05-11 20:42:14 +00:00
Ivan Savenko
a341abbd31
Merge pull request #3927 from IvanSavenko/fix_doubleclick
...
[1.5.1] Fixed mouse double-click handling in some widgets
2024-05-11 21:57:15 +03:00
Ivan Savenko
5b674baa91
Fix slow switching to a channel with large number of messages
2024-05-11 16:44:31 +00:00
Ivan Savenko
87e4756f6d
Fix crash on hiding empty map/save list
2024-05-11 13:19:07 +00:00
Ivan Savenko
1bc7c29111
Add workaround for visiting Altar of Sacrifice on 1.4 saves
2024-05-11 13:19:07 +00:00
Ivan Savenko
a74d9791a1
Remove indirect calls to CSH from server handler itself
2024-05-11 13:19:07 +00:00
