Simeon Manolov
5b6bc10131
Code review
2024-07-12 14:54:28 +03:00
Simeon Manolov
9d73b50979
Bind server to a randomly assigned port
2024-07-12 01:06:36 +03:00
Ivan Savenko
6b8f94e6e7
Merge remote-tracking branch 'vcmi/master' into develop
2024-07-11 17:43:44 +00:00
Ivan Savenko
ef68bd7ac0
Show message to player and close game if creature battle animation is
...
missing (demo assets usage?)
2024-07-10 14:36:24 +00:00
SoundSSGood
b42c6dbf44
fixed regressions
2024-07-09 14:27:05 +03:00
SoundSSGood
ef1fbffad4
ArtifactsUIController class
2024-07-09 14:27:05 +03:00
SoundSSGood
f87762bc96
endBattleConfirm
2024-07-09 14:27:04 +03:00
SoundSSGood
6dd76908bc
MoveArtifact struct not used now
2024-07-09 14:27:04 +03:00
SoundSSGood
5dbe88d9a4
End of battle BulkMoveArtifacts
2024-07-09 14:27:04 +03:00
Ivan Savenko
575d15c425
Fix centering on selected map object on loading save
2024-07-08 20:52:37 +00:00
Laserlicht
8b1c038415
fix
2024-07-06 23:57:08 +02:00
Laserlicht
81574138c7
show only used fields
2024-07-06 23:22:40 +02:00
Laserlicht
37c783b7c1
code review
2024-07-06 22:55:56 +02:00
Xilmi
cf0d08555b
Crash fix
...
Fixed a crash that could occur when closing the game.
2024-07-06 15:34:36 +02:00
Laserlicht
da83f5dc3b
fix if only one line
2024-07-06 13:04:00 +02:00
Laserlicht
301da0b75a
fix for multiplayer
2024-07-06 13:04:00 +02:00
Laserlicht
27dd00f8ce
remember slider location
2024-07-06 13:04:00 +02:00
Laserlicht
3f0be7e904
invite hero scroll
2024-07-06 13:04:00 +02:00
Laserlicht
684a9519b6
max columns
2024-07-06 13:04:00 +02:00
Laserlicht
b3f0bf1e1d
finish slider
2024-07-06 13:04:00 +02:00
Laserlicht
29d4cf274a
basic slider
2024-07-06 13:04:00 +02:00
Ivan Savenko
38bcc1e475
Restored logic of up/down key in town interface
2024-07-04 08:46:39 +00:00
Ivan Savenko
2584432b92
Fix crash on clicking on map when player is not making turn in MP
2024-07-04 08:46:39 +00:00
Ivan Savenko
5ccf6750ab
Fix assertion failure
2024-07-04 08:46:39 +00:00
Ivan Savenko
70af104839
Merge pull request #4208 from Laserlicht/patch-3
...
[1.5.4] fix text lenght
2024-07-03 13:31:29 +03:00
Laserlicht
e142776957
highscore text len
2024-06-29 14:44:29 +02:00
Laserlicht
6e3ff219ec
fix text lenght
2024-06-29 14:32:03 +02:00
Laserlicht
02bd52041b
extend map format
2024-06-29 13:13:59 +02:00
Ivan Savenko
cbbbe1b23a
Add workaround for cursor visibility on mobiles when using touch input
2024-06-27 09:58:53 +00:00
Ivan Savenko
9ea3b31ddc
Use spell name for spell scroll campaign bonus
2024-06-27 09:58:53 +00:00
Ivan Savenko
2eeb6510c1
Warn in log instead of crash on invalid building ID from mod
2024-06-27 09:58:53 +00:00
Alexander Wilms
31e1d39f92
Fix issues introduced by fixing typos
2024-06-27 08:38:04 +00:00
Alexander Wilms
02e429e973
Fix typos using https://github.com/crate-ci/typos
...
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Laserlicht
539ffb3810
fix campaign highscore sum
2024-06-23 15:40:46 +02:00
Laserlicht
11664b27b8
fix for develop
2024-06-21 22:34:14 +02:00
Laserlicht
49cb985452
try to fix ci
2024-06-21 21:29:19 +02:00
Laserlicht
13ebd026cc
remove unnecassary conditions
2024-06-21 21:29:19 +02:00
Laserlicht
fe408c203b
right click + tweak
2024-06-21 21:29:19 +02:00
Laserlicht
53a1bf2051
add spell cast
2024-06-21 21:29:19 +02:00
Laserlicht
e4dfca9f3d
disable correctly
2024-06-21 21:26:10 +02:00
Laserlicht
1a8a14a56d
selectable fix
2024-06-21 21:26:10 +02:00
Laserlicht
989394de53
Selectionwindow
2024-06-21 21:25:14 +02:00
Laserlicht
814241e836
converted to window
2024-06-21 21:25:14 +02:00
Laserlicht
1f6e0fae7d
quickspell draft
2024-06-21 21:25:14 +02:00
Ivan Savenko
3bea383b59
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-06-21 12:58:36 +00:00
Ivan Savenko
0d3408ee68
Add better runtime error on invalid building ID
2024-06-20 10:08:49 +00:00
Ivan Savenko
2b7131cfea
Show error message if vcmi unable to access data directory instead of
...
silent crash
2024-06-19 19:59:06 +00:00
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
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
2521557f68
Fixed some newly reported issues from SonarCloud
2024-05-10 13:40:24 +00:00
Ivan Savenko
2ddb41e654
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-05-10 08:09:51 +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
10a91cb1d8
Merge pull request #3901 from IvanSavenko/sonar_fix
...
[1.6] Fix some new issues reported by Sonar Cloud
2024-05-07 11:59:17 +03: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
30e0a16ee9
Fix some 'new' issues reported by Sonar Cloud
2024-05-06 15:33:30 +00: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
Ivan Savenko
d5a2ad1be8
Allow sending requests to move across multiple tiles at once
2024-04-20 12:28:50 +03:00
Ivan Savenko
7d93206786
Use cache for CAnimImage. Improves performance of CAnimImage
2024-04-20 12:28:50 +03:00
Ivan Savenko
49a28355a9
Send packs for all reachable parts of a path if movement set to instant
2024-04-20 12:28:50 +03:00
Ivan Savenko
9f47a2e6aa
Fix logging of received network packs on client
2024-04-20 12:28:50 +03:00
Laserlicht
68e63630d8
Code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-04-20 00:23:25 +02:00
Laserlicht
cf4384071d
use CIntObject instead of IShowActivatable
2024-04-19 23:11:24 +02:00
Laserlicht
19b75c3d88
possibility to disable dimming of small windows
2024-04-19 22:50:05 +02:00
Ivan Savenko
114709e0b1
Merge pull request #3781 from Laserlicht/save_name
...
set save name by default
2024-04-18 21:34:25 +03:00
Ivan Savenko
0824f50367
Merge pull request #3779 from SoundSSGood/backpackWindow-art-transfer-fix
...
Backpack window cursor fix
2024-04-18 15:18:36 +03:00
Ivan Savenko
3724742247
Merge pull request #3774 from Laserlicht/fix_city_gate
...
fix city gate
2024-04-18 15:09:53 +03:00
Ivan Savenko
9023af4426
Merge pull request #3772 from dydzio0614/resources-bonus
...
Add some utility bonuses for player resources boosting
2024-04-18 15:09:34 +03:00
SoundSSGood
e8eb638bf1
backpack window cursor fix
2024-04-17 16:11:33 +03:00
Dydzio
19453aab41
Add handling for yes/no dialogs that can be safely skipped by player
2024-04-17 01:08:27 +02:00
Laserlicht
b74c1818c4
set save name by default
2024-04-16 21:21:20 +02:00
Ivan Savenko
2861ebb515
Capture members by copy instead of capturing this due to short lifetime
2024-04-16 18:55:21 +03:00
Laserlicht
f847068e92
fix city gate
2024-04-16 00:54:04 +02:00
Dydzio
b351946afd
Add some utility bonuses for player resources boosting
2024-04-15 21:18:45 +02:00
kdmcser
876bae0b73
delete useless include and open joystick in InputSourceGameController constructor.
2024-04-15 23:07:44 +08:00
kdmcser
cee8d34fc5
Merge branch 'develop' into joystick_support
2024-04-15 22:37:15 +08:00
Ivan Savenko
9390825ee7
Merge pull request #3763 from IvanSavenko/fix_tp
...
Fix regressions
2024-04-14 14:14:23 +03:00
Ivan Savenko
8003d0d7ca
Restore handling of double-clicks in message boxes
2024-04-14 13:09:39 +03:00
Ivan Savenko
ae8779779b
Fix typo in file names
2024-04-14 13:09:11 +03:00
DjWarmonger
0808a8b36f
Merge pull request #3714 from vcmi/biome_system
...
Biome system implementation
2024-04-13 21:32:13 +02:00
Ivan Savenko
2f1f68f89d
Do not attempt to move if there are active dialogs
2024-04-13 16:57:21 +03:00
kdmcser
0cac4228e4
fix merge master error
2024-04-13 20:27:46 +08:00
Ivan Savenko
95c0551de5
Merge pull request #3751 from IvanSavenko/fix_dnd_cursor
...
Fix assertion failure with drag-and-drop cursor
2024-04-13 14:39:19 +03:00
Ivan Savenko
d4594baa05
Merge pull request #3749 from IvanSavenko/configurable_shortcuts
...
Configurable keyboard shortcuts
2024-04-13 12:47:30 +03:00
kdmcser
beaebb3a5f
a simple implement for game controller
2024-04-13 13:12:25 +08:00
Laserlicht
e4b60baa3b
creature/town biography/description
2024-04-12 23:35:39 +02:00
Ivan Savenko
0bd1c3c95d
Merge pull request #3746 from IvanSavenko/fix_undefined_behavior
...
Fix discovered undefined behavior cases
2024-04-12 11:51:13 +03:00
Ivan Savenko
a7d47cd3d2
Merge pull request #3742 from IvanSavenko/adventure_map_spellcast_fixes
...
Adventure map spellcasting fixes
2024-04-12 11:17:19 +03:00
Ivan Savenko
de5bd5f94c
Reset picked artifact on window deactivation
2024-04-11 23:52:37 +03:00
Ivan Savenko
fa9e0669f2
Remove excessive call - will be reset on window push anyway
2024-04-11 23:51:58 +03:00
Ivan Savenko
ac1c36b7e2
Fixed not working shortcuts on some buttons in main menu
2024-04-11 22:00:54 +03:00
Ivan Savenko
611249d11d
Added workaround for weird SDL behavior that causes SDL to report text
...
input as active when app starts until first actual text input
2024-04-11 22:00:20 +03:00
Ivan Savenko
16c56cf6c5
Keyboard shortcuts are now loaded from config file
2024-04-11 21:21:46 +03:00
Ivan Savenko
cbd5f57069
Added workaround for potential access to CIntObject after destruction
2024-04-11 13:25:54 +03:00
Ivan Savenko
c99d4b959e
Fix potentially uninintialized variables
2024-04-11 13:25:54 +03:00
Ivan Savenko
9188280d02
Fix access to CPrologEpilogVideo after destruction from sound callback
2024-04-11 13:25:54 +03:00
SoundSSGood
6a0e8b0cab
Junkyard crash fixed
2024-04-11 01:44:15 +03:00
SoundSSGood
ca0f7aee7d
artifactMoved assertion fix
2024-04-10 23:30:31 +03:00
Ivan Savenko
320469d773
Cleanup
2024-04-10 20:04:08 +03:00
Ivan Savenko
8353bca34f
Small refactoring of adventure map spell casting:
...
- Removed duplicated checks for DD possibility
- Moved most of spell-specific code from AdventureMapInterface to library
code
- AdventureSpellMechanics class now provides methods to check whether
spellcast is possible, similarly to battle spells
- If it is not possible to cast adventure map spell (e.g. no mana or no
move points) game will show infowindow immediately on clicking spellbook
instead of on cast attempt
- If hero does not have movement points for a DD, game will show correct
error message
- Added game settings 'dimensionDoorFailureSpendsPoints' due to
discovered H3 logic
2024-04-10 20:04:08 +03:00
Ivan Savenko
bcd4a8c961
Merge pull request #3736 from IvanSavenko/fix_server_translations
...
Do not translate strings on server side
2024-04-10 19:12:34 +03:00
Ivan Savenko
5b43720dda
Merge pull request #3686 from dydzio0614/dimension-door-changes
...
Dimension door changes
2024-04-10 11:47:36 +03:00
Ivan Savenko
510e1023da
Merge pull request #3730 from IvanSavenko/localization_export
...
Better export command for translations
2024-04-09 19:11:10 +03:00
Ivan Savenko
18ece6dcf6
Remove some usages of server-side translations
2024-04-09 16:13:30 +03:00
Ivan Savenko
b0334b381e
Merge pull request #3724 from IvanSavenko/fix_server_shutdown
...
Simplified and fixed server restart procedure
2024-04-09 16:13:19 +03:00
Ivan Savenko
576939f105
Merge pull request #3713 from Laserlicht/scalingMode
...
scalingMode to config
2024-04-09 12:48:35 +03:00
Ivan Savenko
f73243eb1c
Merge pull request #3669 from SoundSSGood/market-window-unified
...
Market window and widgets
2024-04-09 12:48:25 +03:00
Tomasz Zieliński
d9a598ad9c
Merge remote-tracking branch 'origin/develop' into biome_system
2024-04-08 15:01:17 +02:00
SoundSSGood
39a0e56169
suggested changes
2024-04-08 14:57:58 +03:00
Tomasz Zieliński
3e3959d360
Move all OH3 objects and obstacle sets to a mod
2024-04-08 12:50:41 +02:00
Ivan Savenko
8582bd7d66
Replaced 'convert txt' command with more convenient 'translate' and
...
'translate maps' commands.
2024-04-08 13:16:23 +03:00
Ivan Savenko
e89e5d2127
Rename for clarity
2024-04-07 21:22:33 +03:00
Ivan Savenko
0a296add0c
apply SonarCloud suggestions
2024-04-07 21:21:48 +03:00
Ivan Savenko
80acd7e77c
Simplified and fixed server restart procedure:
...
- Replaced several assertions with runtime_error's to detect them in
release builds
- Removed multiple dispatchMainThread calls in server shutdown code to
simplify debugging and code flow
- Moved handling of gameplay shutdown and score calculation from
PlayerInterface to ServerHandler (not perfect, but better than before)
2024-04-07 14:19:57 +03:00
Ivan Savenko
0a80c6c27b
Merge pull request #3722 from IvanSavenko/stabilization
...
Fixes for recently reported crashes
2024-04-07 14:07:56 +03:00
Ivan Savenko
4bef4d9277
Merge pull request #3718 from IvanSavenko/lobby_tweaks_3
...
Few more tweaks for new lobby
2024-04-07 14:07:49 +03:00
Ivan Savenko
2d9e42b623
Do not attempt to show extra options in campaign scenario information
...
screen
2024-04-06 15:59:08 +03:00
Andrii Danylchenko
c7b5d254d7
Fix castel interface closing by turn timer
2024-04-06 11:42:39 +03:00
Ivan Savenko
7c18c8b1da
Add comment
2024-04-05 18:50:06 +03:00
Ivan Savenko
ee1aa4ed05
Fix overlaying UI elements when player has no account created
2024-04-05 18:50:06 +03:00
Ivan Savenko
651908d7aa
Do not attempt to translate usernames
2024-04-05 18:50:06 +03:00
Ivan Savenko
fa31e9f69b
Do not mark channel as unread when receiving chat history
2024-04-05 18:50:06 +03:00
Laserlicht
ff866bdfce
scalingMode to config
2024-04-04 21:10:49 +02:00
Dydzio
3f94d316cb
Fix cursor & add way to access danger info for HotA-like DD cursor
2024-04-01 20:18:35 +02:00
Dydzio
3bb66de551
Serverside validation, setting for terrain compatibility before cast etc
2024-04-01 18:12:38 +02:00
Dydzio
e69c096f94
Move dimension door FoW limit check to lib
2024-04-01 15:13:18 +02:00
Dydzio
70b86e5a87
Merge remote-tracking branch 'origin/develop' into dimension-door-changes
2024-03-30 10:45:00 +01:00
Ivan Savenko
dd91a99e36
Distinguish "connected but not logged in" from "not connected" state
...
Possible in case of login failure
2024-03-30 10:26:07 +02:00
Ivan Savenko
acd2352653
Merge pull request #3699 from IvanSavenko/lobby_tweaks
...
Minor tweaks for most noticeable issues with new lobby
2024-03-30 00:13:14 +02:00
Andrii Danylchenko
ca7c91e766
Merge pull request #3677 from vcmi/object-graph
...
Object graph
2024-03-29 20:39:56 +02:00
Ivan Savenko
975cf7de95
Tweaks to lobby login window to make it more clear to use
2024-03-29 17:05:41 +02:00
Ivan Savenko
8f0236f046
Move account login details from settings to persistent storage, with
...
separate entries depending on server hostname for more convenient
testing
2024-03-29 17:04:52 +02:00
SoundSSGood
cb6fc4a385
Regressions fixed
2024-03-29 16:21:59 +02:00
Evgeny Malygin
ee42527ee1
Fixes
2024-03-29 12:28:14 +02:00
Evgeny Malygin
25125f96da
Fix: licenses, pragma guards, StdInc
2024-03-29 07:48:52 +02:00
Evgeny Malygin
54405e33bc
Fix: prevent possible int16_t overflow
2024-03-29 05:37:47 +02:00
Dydzio
fe42fab2d6
Merge remote-tracking branch 'origin/develop' into dimension-door-changes
2024-03-28 18:26:21 +01:00
Andrii Danylchenko
30d9daf62c
NKAI: improve boat handling by object graph, a set of fixes
2024-03-28 13:39:15 +02:00
Ivan Savenko
1f487dab49
Merge pull request #3685 from dydzio0614/small-fixes
...
Small fixes
2024-03-28 13:17:57 +02:00
Dydzio
25f9e6a3e9
Add setting to allow previous VCMI mechanics of dimension door
2024-03-27 23:39:08 +01:00
Dydzio
048fb1867d
Merge remote-tracking branch 'origin/develop' into dimension-door-changes
2024-03-27 23:03:33 +01:00
Dydzio
38659abcb8
Fix wrong cursor assignment for uncovered tiles beyond DD range
2024-03-27 22:48:53 +01:00
Dydzio
4f0a286167
Fix checks for tile visibility in tile click/hover handlers
2024-03-27 22:06:31 +01:00
Dydzio
e0855ceb7a
Add pitch black FoW representation for dimension door range map overlay
2024-03-27 21:39:36 +01:00
Dydzio
cfe7a3cfa6
Fix some more cases of missing pathfinder cache invalidation
2024-03-27 21:17:21 +01:00
Ivan Savenko
671b61c64e
Implement various todo's and review suggestions
2024-03-27 13:10:55 +02:00
Ivan Savenko
b9cd9a5822
Open lobby when players leaves pregame menu opened via lobby
2024-03-27 13:10:55 +02:00
Ivan Savenko
73d8789f8d
(untested) activate lobby UI on 3-finger touch
2024-03-27 13:10:55 +02:00
Ivan Savenko
d700e94189
Code cleanup
2024-03-27 13:10:55 +02:00
Ivan Savenko
862f6f8c7b
Added descriptions for new buttons in pregame menu
2024-03-27 13:10:55 +02:00
Ivan Savenko
d59fb87504
Indicate rooms with active invites, fix invite acceptance
2024-03-27 13:10:55 +02:00
Ivan Savenko
69f7b3169e
UI improvements for lobby:
...
- Added notifications sounds for invites and chat messages
- Added notifications for unread chat messages in inactive channels
- Added click sound when switching between channels
- Added workaround to prevent clicks due to list recreation
- Partial support for receiving invites
2024-03-27 13:10:55 +02:00
Ivan Savenko
ace43e97b9
Added UI for inviting players into a match
2024-03-27 13:10:55 +02:00
Ivan Savenko
4dce0479ba
UI improvements for lobby screen:
...
- Show description of current chat room in header
- Show count of online accounts / active rooms
- Highlight currently selected chat room
2024-03-27 13:10:55 +02:00
Ivan Savenko
489dd781c2
Show match creation date in history
2024-03-27 13:10:55 +02:00
Ivan Savenko
b50d9de912
Show opponent name in 1-vs-1 games, minor tweaks
2024-03-27 13:10:55 +02:00
Ivan Savenko
829b754091
Implemented matches history in lobby
2024-03-27 13:10:55 +02:00
Ivan Savenko
4ed961fb96
Partially unified handling of pregame and in-game chats
2024-03-27 13:10:55 +02:00
Ivan Savenko
df5af589ae
Implemented per-language, player-player and (untested) match channels.
2024-03-27 13:10:55 +02:00
Ivan Savenko
8e9caf54f2
Added all missing text alignment values
2024-03-27 13:10:55 +02:00
Ivan Savenko
5d188024db
Set room status to "In Game" once gameplay starts
2024-03-27 13:10:55 +02:00
Ivan Savenko
7c9aa9d953
Show all rooms (including private) in room list
2024-03-27 13:10:55 +02:00
Ivan Savenko
dcf35e4877
Clicking "Create New Room" button with active room now will switch to
...
game lobby UI
2024-03-27 13:10:55 +02:00
Ivan Savenko
16605a7aaa
Allow hiding global lobby UI via Shift+Tab
2024-03-27 13:10:55 +02:00
Ivan Savenko
3023db6f0f
Store and show correct player room limit in UI
2024-03-27 13:10:55 +02:00
Ivan Savenko
715e094f5c
Implemented room description display (map/template name)
2024-03-27 13:10:55 +02:00
Ivan Savenko
69236b73ca
Added player count icon and enter room icon to room widget
2024-03-27 13:10:55 +02:00
Ivan Savenko
4f34c07f22
Provide correct size to room and account lists
2024-03-27 13:10:55 +02:00
Ivan Savenko
2d37180fe2
Chat textbox now correctly positioned and uses blue slider
2024-03-27 13:10:55 +02:00
Ivan Savenko
be641d1710
Split 'loginSuccess' into server and client-specific versions
2024-03-27 13:10:55 +02:00
SoundSSGood
2cdf2b4083
fixed missed trader text
2024-03-25 17:38:43 +02:00
Ivan Savenko
83984a73c7
Merge pull request #3668 from kambala-decapitator/fix-ios
...
make iOS work again
2024-03-25 15:03:01 +02:00
SoundSSGood
c6c213c454
CMarketBase::hRight CMarketBase::hLeft removed. Final changes
2024-03-25 12:56:46 +02:00
SoundSSGood
cc14f85445
Refactoring. Regressions fixing.
2024-03-25 12:55:05 +02:00
SoundSSGood
433d55cac3
Market window unified
2024-03-25 12:44:34 +02:00
SoundSSGood
ae8d70748b
Altar artifacts widget refactoring
2024-03-25 12:44:33 +02:00
SoundSSGood
4839891de4
Cleanup & refactoring
2024-03-25 12:44:33 +02:00
SoundSSGood
f3fa6714dc
Artifacts selling widget
2024-03-25 12:44:33 +02:00
SoundSSGood
bb7137545f
Artifacts market widget
2024-03-25 12:44:33 +02:00
SoundSSGood
4e0ea7355b
Transfer resources widget
2024-03-25 12:44:33 +02:00
SoundSSGood
4d3bf882ed
market resources widget
2024-03-25 12:44:33 +02:00
SoundSSGood
6b658bf9c1
freelancer guild widget
2024-03-25 12:44:33 +02:00
SoundSSGood
0813fdbf8c
market window
2024-03-25 12:44:33 +02:00
Dydzio
807035c321
temporarily add TODO's
2024-03-25 09:21:42 +01:00
Dydzio
982e67cea8
Working version of SoD dimension door spell
2024-03-24 23:58:04 +01:00
Dydzio
96b18b1b8e
Fix possibilities to get outdated movement points info due to creature types
2024-03-24 20:19:14 +01:00
Ivan Savenko
6a5696604e
Merge pull request #3656 from SoundSSGood/backpack-management
...
Backpack management init
2024-03-24 19:09:32 +02:00
Andrii Danylchenko
3820f6f78b
NKAI: fix headless and compilation
2024-03-24 13:16:46 +02:00
Andrii Danylchenko
e66ceff154
NKAI: object graph improved and optimized
2024-03-21 12:13:36 +02:00
Andrey Filipenkov
788e9093f3
[iOS] fix app icon size, remove unused icon
2024-03-20 05:52:26 +03:00
Andrey Filipenkov
35cf227b35
[cmake] simplify 'share' files installation on Linux
2024-03-19 21:55:45 +03:00
DjWarmonger
2c9b7089ad
Merge pull request #3645 from vcmi/save_rmg_options
...
Save rmg options
2024-03-14 19:54:08 +01:00
Ivan Savenko
94ecef748b
Merge pull request #3654 from IvanSavenko/lobby_protocol
...
Lobby protocol documentation and fixes
2024-03-11 18:07:57 +02:00
Andrii Danylchenko
c9c118cff2
Merge pull request #3595 from vcmi/object-graph
...
NKAI Object graph
2024-03-10 20:26:17 +02:00
Ivan Savenko
c21e5bb0fb
Always validate messages in debug mode. Fixes for schemas
2024-03-08 16:32:40 +02:00
Ivan Savenko
456dfd9e3d
Added debug validation of lobby protocol on every send/receive
2024-03-08 16:32:40 +02:00
Ivan Savenko
5b1549200a
Renamed openGameRoom to more clear activateGameRoom
2024-03-08 16:32:39 +02:00
SoundSSGood
d7607983fc
sonarcloud warnings
2024-03-08 14:33:03 +02:00
SoundSSGood
9f688e6fb7
MoveArtifact, BulkMoveArtifacts PlayerColor player field
2024-03-07 22:28:56 +02:00
SoundSSGood
b1f52eec41
ManageBackpackArtifacts
2024-03-07 18:16:22 +02:00
SoundSSGood
d143f53d7e
using deque for hero's backpack storage
2024-03-07 18:16:21 +02:00
Tomasz Zieliński
e7af9d5607
Code review fixes, Sonarcloud fixes
2024-03-04 21:23:17 +01:00
Ivan Savenko
4b2cba96cc
Merge pull request #3646 from IvanSavenko/configurable_button
...
Configurable buttons
2024-03-04 13:34:40 +02:00
Ivan Savenko
83eb0ea28f
Merge pull request #3625 from IvanSavenko/exchange_in_town
...
Better hero exchange in town
2024-03-04 13:34:15 +02:00
Andrii Danylchenko
fb6fd63a58
NKAI: water paths in graph
2024-03-02 15:55:36 +02:00
Andrii Danylchenko
047e076d05
NKAI: visual logger
2024-03-02 15:54:05 +02:00
Tomasz Zieliński
f650072da1
Remove useless code
2024-03-01 11:46:01 +01:00
Tomasz Zieliński
35c1ef7be2
How about now?
2024-03-01 11:18:08 +01:00
Tomasz Zieliński
7df36279c5
Compile fix?
2024-03-01 11:10:40 +01:00
Tomasz Zieliński
5f95955535
Store and load last difficulty setting
2024-03-01 10:57:48 +01:00
Tomasz Zieliński
17fc1604ca
Remove unused file
2024-02-29 20:20:35 +01:00
Ivan Savenko
22f23ba6f8
Restore previously disabled functionality
2024-02-29 16:47:44 +02:00
Ivan Savenko
ddb2acb9c2
Code cleanup
2024-02-29 15:39:13 +02:00
Tomasz Zieliński
b7320bbc8a
Cleanup
2024-02-29 13:04:48 +01:00
Ivan Savenko
20008cd5a5
Replaced premade buttons on hero screen with generated ones
2024-02-29 13:57:25 +02:00
Ivan Savenko
0051ffa7a9
Implemented configurable buttons. Replaced 'animateLonelyFrame' logic.
2024-02-29 13:57:25 +02:00
Ivan Savenko
07d201502e
Refactoring of button class to prepare for configurable button
2024-02-29 13:57:25 +02:00
Tomasz Zieliński
2c32c770f7
First version that works in lobby
2024-02-29 12:45:08 +01:00
Ivan Savenko
658747d342
Code cleanup
2024-02-27 14:45:15 +02:00
Ivan Savenko
99cb1df91d
Fixes for positioning on popups with components
2024-02-27 13:15:16 +02:00
Ivan Savenko
93b3cb3af5
Better size & positioning of infoboxes
2024-02-26 22:04:30 +02:00
Ivan Savenko
ec159f2fdd
Fixed bad line breaks in starting faction description popup
2024-02-26 22:04:02 +02:00
Ivan Savenko
4b4dedeab9
Code formatting
2024-02-26 18:53:12 +02:00
Ivan Savenko
e6b339448f
Refactoring & deduplication of infowindow code
2024-02-26 18:32:15 +02:00
Ivan Savenko
658cc14cd0
Removed direct usage of SDL_Surface in info windows
2024-02-26 15:49:27 +02:00
Ivan Savenko
5419df1140
Removed no longer used class
2024-02-26 15:49:27 +02:00
Ivan Savenko
922966dcf8
Renamed JsonNode::meta to more logical modScope. Member is now private
2024-02-26 12:55:49 +02:00
Ivan Savenko
08a27663f9
Reworked JsonNode constructors to more logical form
2024-02-26 12:55:49 +02:00
Ivan Savenko
54796c7c56
Rename toJson to toString/toCompactString for consistency
2024-02-26 12:55:49 +02:00
Ivan Savenko
8647abb94b
Merge pull request #3629 from IvanSavenko/ui_generation
...
Unify graphical primitives elements
2024-02-25 15:02:06 +02:00
Ivan Savenko
bd901cb001
Replaced lines in settings with primitives
2024-02-19 16:55:07 +02:00
Ivan Savenko
82eea1abc1
Remove unused variable
2024-02-19 16:49:59 +02:00
Ivan Savenko
fe918de2df
Remove invalid assertion
2024-02-19 00:36:21 +02:00
Ivan Savenko
ef8ff00973
Unified common primitive-based UI elements
2024-02-18 22:15:31 +02:00
Ivan Savenko
14e3c762c0
Fix slot selection in markets
2024-02-18 21:18:55 +02:00
Ivan Savenko
8b60275a6e
Hero exchange in town is now activated by clicking on hero portrait
2024-02-18 21:02:24 +02:00
Ivan Savenko
af671d109f
Made graphical primitive-based UI more configurable
2024-02-18 20:48:45 +02:00
Ivan Savenko
110ef5f66e
Merge pull request #3614 from IvanSavenko/sonarcloud_fixes_2
...
Sonarcloud fixes 2
2024-02-14 16:44:58 +02:00
Ivan Savenko
c3957c2c2a
Moved json files to new directory, split on per-class basis
2024-02-14 13:08:24 +02:00
Ivan Savenko
c23953eac5
Remove custom casts
2024-02-14 12:56:37 +02:00
Ivan Savenko
7359b66f99
Do not use floating point equality checks
2024-02-14 12:07:07 +02:00
Ivan Savenko
9ebd194ab1
Merge pull request #3609 from IvanSavenko/single_process
...
Allow running server as part of client process
2024-02-14 12:06:22 +02:00
Alexander Wilms
c65794b9e3
Fix typos
2024-02-13 15:23:30 +01:00
Ivan Savenko
bfdb9a85f0
Merge pull request #3611 from IvanSavenko/lobby_fixes
...
Networking code fixes
2024-02-13 15:30:26 +02:00
Ivan Savenko
7c34d48258
Minor fixes and corrections to network-related code. No functionality
...
changes.
2024-02-12 18:57:20 +02:00
Ivan Savenko
74f9b03516
Fix crash on closing client while server is active
2024-02-12 16:36:13 +02:00
Ivan Savenko
62148e1506
Fix build
2024-02-12 15:08:46 +02:00
Ivan Savenko
4c70abbeb5
Reduced usage of global variables - removed or made const / constexpr
2024-02-12 13:49:45 +02:00
Ivan Savenko
6e399eb21a
Make some non-const static variables const or constexpr
2024-02-12 13:22:54 +02:00
Ivan Savenko
392c360f88
Replaced some usages of void * with more clear CPack *
2024-02-12 12:53:10 +02:00
Ivan Savenko
b796ed8626
Fix undefined behavior
2024-02-12 12:33:09 +02:00
Ivan Savenko
c577ea3e8d
Fix potentially uninitialized values
2024-02-12 12:31:27 +02:00
Ivan Savenko
a909d7ddde
Removed cmake_modules/VCMI_lib macro, use it directly in place
2024-02-11 20:38:24 +02:00
Ivan Savenko
19ccef7131
Fix build
2024-02-11 19:54:30 +02:00
Ivan Savenko
cded8b1999
Show human-readable thread name in log
2024-02-11 17:55:02 +02:00
Ivan Savenko
0fc0ad238b
Fixes for server shutdown logic, implemented connection aborting for
...
local server
2024-02-11 17:55:02 +02:00
Ivan Savenko
f08c9f4d59
Renamed ENABLE_STATIC_AI_LIBS option to match its actual effect
2024-02-11 17:55:02 +02:00
Ivan Savenko
0d263c5571
Implemented option to run server as a thread with shared VLC
2024-02-11 17:55:02 +02:00
Ivan Savenko
ef8eb330d6
Merge branch 'develop' into random_template_description
2024-02-11 17:54:18 +02:00
Ivan Savenko
38ba42ef7a
Rename 'c' to 'logicConnection'
2024-02-11 16:26:27 +02:00
