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
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
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
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
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
Ivan Savenko
46f2b8b2d7
Attempt to fix weird crash on game start
2024-05-11 13:19:07 +00:00
Ivan Savenko
278e8ac65e
Do not show preview for ranged retaliation - not implemented in lib
2024-05-10 19:51:36 +00:00
Ivan Savenko
d094a17298
Added simple damage preview for retaliations
2024-05-10 19:40:33 +00:00
Ivan Savenko
64d6e48540
Fixed mouse double-click handling in some widgets.
...
Now double-click when 1st click was not inside widget should work as
expected:
- scenario list: 2nd click on non-selected scenario will select it
instead of starting unselected map
- component selection: 2nd click on non-selected component would select
it instead of confirming choice
- town portal dialog: 2nd click on non-selected town would only select
it
- tavern window: right-click would now also select this hero (h3 logic)
2024-05-10 16:05:59 +00:00
Ivan Savenko
8b861fc58f
Do not check for guards when teleporting using means other than DD
2024-05-07 20:05:23 +00:00
Ivan Savenko
ffc207888b
Added option to configure key modifiers (Alt, Shift, Ctrl). Fixes lobby
...
hotkey activation.
2024-05-07 08:58:45 +00:00
DjWarmonger
4949b98ed3
Merge pull request #3759 from Laserlicht/bio
...
Let's try this
2024-05-07 09:05:14 +02:00
Ivan Savenko
cd79953693
Fix crash on accessing campaign screen
2024-05-06 12:32:32 +00:00
SoundSSGood
03c6684622
Cosmetic market window fix
2024-05-03 12:36:13 +03:00
Ivan Savenko
6ac67775f5
Merge pull request #3861 from Laserlicht/pvp_options
...
Pvp options
2024-05-03 10:38:42 +03:00
Ivan Savenko
c19992ee5b
Do not animate events such as new monsters
2024-05-02 22:16:41 +03:00
Laserlicht
1f209fd94a
use MetaString
2024-05-02 21:03:23 +02:00
Laserlicht
37d9e862c2
Code review
2024-05-02 20:15:34 +02:00
Ivan Savenko
68bd54ae99
Fix server error messages on moving through garrisons
2024-05-02 18:05:57 +03:00
Ivan Savenko
d3d15cd6b9
Loop audio stream from video file on campaing prolog/epilog window
2024-05-02 16:45:46 +03:00
Ivan Savenko
c7dd0c6523
Fix possible crash on actions with no initiator set
...
Such as spawning of new wandering monsters on new month
2024-05-02 16:45:11 +03:00
Laserlicht
812e96ebb1
Guest can also use & renaming
2024-05-01 15:58:22 +02:00
Laserlicht
5b8b75da22
small fixes
2024-05-01 15:30:35 +02:00
Laserlicht
89b750c749
allow translations in chat
2024-05-01 15:00:36 +02:00
Laserlicht
426a008506
no slider needed when only 9 towns
2024-05-01 13:36:00 +02:00
Laserlicht
1a51495ef5
show popup window for towns
2024-05-01 13:19:58 +02:00
Ivan Savenko
45e35f357d
Merge pull request #3866 from IvanSavenko/input_config
...
More configurable input settings
2024-05-01 09:49:02 +03:00
Laserlicht
5413fc2c7e
finished
2024-05-01 01:26:51 +02:00
Laserlicht
e505aab29a
scrolling works
2024-05-01 00:49:33 +02:00
Laserlicht
7c96ffa8ff
townselector
2024-04-30 23:12:55 +02:00
Laserlicht
78b8c2c71c
changed layout
2024-04-30 21:52:04 +02:00
Ivan Savenko
91ff82e74f
Remove no longer used values
2024-04-30 21:35:07 +03:00
Ivan Savenko
73f4ad46ca
Tweaked default settings for controller sensitivity
2024-04-30 21:29:49 +03:00
Ivan Savenko
89d6ddd916
Allow input configuration via config file
2024-04-30 20:56:47 +03:00
Ivan Savenko
dd9e002031
Add hotkey to track human player hero in MP. Fixed broken 'toggle grid'
...
hotkey
2024-04-30 19:10:10 +03:00
Ivan Savenko
74d3b4ab43
Added block for several more actions outside of our turn
2024-04-30 17:51:32 +03:00
Ivan Savenko
d53082e1c1
Block few more cases of access during another player turn in UI
2024-04-30 17:51:32 +03:00
Ivan Savenko
1775caa872
UI now correctly blocks stack rearrangement when it is not our turn
2024-04-30 17:51:32 +03:00
Ivan Savenko
49691ef743
Unblock interface during turn of another human player
2024-04-30 17:51:31 +03:00
Ivan Savenko
742149062a
Apply SonarCloud suggestions
2024-04-30 16:40:23 +03:00
Ivan Savenko
2ba4458cea
Remove no longer used enum
2024-04-30 15:37:30 +03:00
Ivan Savenko
2b9ad0fdfa
Fix time handling
2024-04-30 15:31:35 +03:00
Ivan Savenko
f593321f4c
Fix style
2024-04-30 15:23:19 +03:00
Ivan Savenko
1dc27046ef
Unified game controller input with keyboard/mouse
2024-04-30 15:21:07 +03:00
Ivan Savenko
9a71614588
Simplify code
2024-04-30 12:01:03 +03:00
Ivan Savenko
0d8d75afd4
Spaces -> tabs
2024-04-30 11:38:13 +03:00
Ivan Savenko
9187beb7ee
Merge branch 'joystick_support' into joystick_support
2024-04-30 11:27:55 +03:00
Laserlicht
0565c062e5
Server functionality
2024-04-30 01:52:49 +02:00
Laserlicht
f4d1442a86
pvp option init
2024-04-29 23:55:02 +02:00
Ivan Savenko
26ffa3342b
Fix locked UI on starting multiplayer game
2024-04-29 17:02:27 +03:00
Ivan Savenko
75ff1f7b60
Fix app freeze on attempt to exit game during loading
2024-04-29 17:02:02 +03:00
DjWarmonger
86bf4f98af
Merge pull request #3846 from vcmi/triple_resource_window
...
Handle triple resources in creature recruitment window
2024-04-29 12:23:10 +02:00
kdmcser
92b1c8deb5
Merge branch 'develop' into joystick_support
2024-04-29 00:49:04 +08:00
kdmcser
836c891c36
support map scroll
2024-04-29 00:43:48 +08:00
SoundSSGood
7543e26d42
dismiss hero with fix
2024-04-28 19:01:14 +03:00
Ivan Savenko
c74d728f5a
Merge pull request #3833 from SoundSSGood/artifacts-costumes
...
Artifacts costumes
2024-04-28 16:10:24 +03:00
Tomasz Zieliński
34d8afaa67
Even better alignment
2024-04-28 12:40:55 +02:00
Ivan Savenko
142bbe652a
Merge pull request #3829 from IvanSavenko/goldmaster
...
Tweaks for public release mode
2024-04-28 13:11:38 +03:00
Ivan Savenko
aac25f72b4
Merge pull request #3843 from IvanSavenko/fix_lobby_window_position
...
Fix positioning of lobby window after resolution or UI scaling change
2024-04-28 13:11:10 +03:00
Tomasz Zieliński
4f7a8d83cc
Tweak text alignment
2024-04-28 10:29:22 +02:00
Tomasz Zieliński
f28438902a
Fit 3 resources in creature recruitmnet window
2024-04-28 07:54:19 +02:00
SoundSSGood
ce68b3f45d
class CArtifactsOfHeroMain : public CKeyShortcut
2024-04-27 21:35:38 +03:00
SoundSSGood
ce9d2d8ab8
Switching costume
2024-04-27 21:35:37 +03:00
SoundSSGood
25dea7e364
Saving costume
2024-04-27 21:35:37 +03:00
Ivan Savenko
24a233f8ad
Fix positioning of lobby window after resolution or UI scaling change
2024-04-27 21:32:16 +03:00
Laserlicht
ab50bf9198
biography to description
2024-04-27 18:41:21 +02:00
kdmcser
1eea8398b4
make joystick configurable
2024-04-27 22:42:54 +08:00
Andrii Danylchenko
39e19f79f4
Fix #3754 , #2316
2024-04-27 13:57:50 +03:00
Ivan Savenko
0c24c93c8c
SonarCloud fixes
2024-04-26 17:57:16 +03:00
Ivan Savenko
eaae78da7a
Do not reset map settings unless player switches between scenario and
...
random map
2024-04-26 16:51:40 +03:00
Ivan Savenko
b54eede01c
Always show dialog when player starts turn in multiplayer
2024-04-26 15:59:44 +03:00
Ivan Savenko
01c2814d35
Merge pull request #3821 from SoundSSGood/CWindowWithArtifacts-refactoring
...
CWindowWithArtifacts refactoring
2024-04-26 11:58:38 +03:00
Ivan Savenko
6413747fff
Merge pull request #3828 from IvanSavenko/fix_rewardable
...
Fix crash on visiting misconfigured rewardable object
2024-04-26 11:58:27 +03:00
Ivan Savenko
fca53e4dbc
Do not show "(client)" in window title
2024-04-25 18:53:12 +03:00
Ivan Savenko
1dc962804e
Fixed possible crash on having selectable reward with no visual image
2024-04-25 14:04:45 +03:00
SoundSSGood
c9a8f8e855
Sonarcloud warnings
2024-04-23 22:21:46 +03:00
Ivan Savenko
30a3081ab4
Use account name from lobby when joining lobby game rooms
2024-04-23 19:22:31 +03:00
Ivan Savenko
f40acfc120
Fixed display of mod version for excessive mods
2024-04-23 19:21:57 +03:00
SoundSSGood
20471c9c2f
virtual CWindowObject
2024-04-23 18:58:41 +03:00
Ivan Savenko
f88ff57810
Adjusted main lobby widget to account for removed 'join room' button
2024-04-23 17:15:59 +03:00
Ivan Savenko
662a508944
Better UI design for room preview dialog
2024-04-23 17:15:59 +03:00
Ivan Savenko
3e23a55c66
Fix build
2024-04-23 17:15:59 +03:00
Ivan Savenko
1840666327
Implemented join room dialog
2024-04-23 17:15:59 +03:00
Ivan Savenko
e5f8cefa7f
Store and send mod list and game version for game rooms
2024-04-23 17:15:59 +03:00
SoundSSGood
25d2b468c3
CWindowWithArtifacts preparations
2024-04-23 16:06:58 +03:00
Ivan Savenko
3311676f1d
Fix incorrect string ID
2024-04-22 16:51:08 +03:00
Ivan Savenko
50dc6f67c6
Merge pull request #3809 from dydzio0614/shortcut-enhancements
...
Artifact management shortcuts + game begin default keybind fix
2024-04-22 11:13:09 +03:00
Ivan Savenko
2fee4b3c09
Merge pull request #3807 from Laserlicht/fix_newgame
...
fix error with custom campaign
2024-04-22 11:10:14 +03:00
Ivan Savenko
21dff9413e
Merge pull request #3786 from IvanSavenko/instant_movement
...
Instant movement
2024-04-22 11:08:00 +03:00
Ivan Savenko
dc4528ba39
Merge pull request #3796 from Laserlicht/dim_small
...
possibility to disable dimming of small windows
2024-04-22 11:07:13 +03:00
Ivan Savenko
1b469036a3
Merge pull request #3784 from dydzio0614/quick-dwellings-visit
...
Add handling for yes/no dialogs that can be safely skipped by player
2024-04-22 11:06:40 +03:00
kdmcser
60c4ddb515
change hardware cursor to software cursor when joystick available
2024-04-21 22:51:47 +08:00
Dydzio
316c5986f7
Update client/widgets/CWindowWithArtifacts.cpp
...
Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>
2024-04-20 23:52:24 +02:00
Dydzio
c8dfe07f17
Apply suggestions from code review
...
Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>
2024-04-20 23:24:44 +02:00
M
9e6f558631
Add quick swapping artifacts between heroes via CTRL+click
2024-04-20 20:25:45 +02:00
Laserlicht
1f850b8e4e
fix error with custom campaign
2024-04-20 18:57:53 +02:00
M
bfda73f69f
Add quick artifact equip-unequip via holding alt button while clicking
2024-04-20 18:15:45 +02:00
M
6fed084055
Do not use enter for non-campaign game start, do not use "B" for non-campaign game start
2024-04-20 15:43:39 +02:00
Andrii Danylchenko
70fad45316
Merge pull request #3770 from vcmi/nkai-multitask
...
NKAI: allow multiple tasks to be executed from one calculation
2024-04-20 15:21:11 +03:00
Andrii Danylchenko
3939c4b9d3
NKAI: stability fixes and regression
2024-04-20 14:32:58 +03:00
Ivan Savenko
6352f268b2
Instant movement is now part of standard movement
2024-04-20 14:20:54 +03:00
