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

6604 Commits

Author SHA1 Message Date
Ivan Savenko
b7b25bffd2
Merge pull request #4347 from kaja47/opto
little optimization in MapRenderer
2024-08-01 21:18:44 +03:00
Ivan Savenko
9f7abfe6e9
Merge pull request #4346 from Laserlicht/mod_comp
[1.5.6?] online lobby - mod compatibility improvements
2024-08-01 21:18:30 +03:00
Ivan Savenko
92902d3327
Merge pull request #4345 from Laserlicht/text_sizes
[1.5.6?] limit text sizes in online lobby
2024-08-01 21:18:16 +03:00
Ivan Savenko
88eff2609b
Merge pull request #4332 from Laserlicht/campaign_highscores
fix campaign highscores
2024-08-01 21:16:50 +03:00
K
07e2ec8474 little optimization in MapRenderer
When we replace static const std::vector by std::array the compiler
generates much shorter and nicer binary which doesn't waste time
initializing data structure during runtime.
2024-07-31 22:54:44 +02:00
Laserlicht
12af016eac more colors for status 2024-07-31 22:27:15 +02:00
Laserlicht
0cc743f7ca
mod compatibility improvements 2024-07-31 22:10:37 +02:00
Laserlicht
0d1f744ba4
limit text sizes 2024-07-31 21:40:49 +02:00
Laserlicht
a8fe8cbcf0 adjust text; increase gold input size 2024-07-29 23:48:00 +02:00
Laserlicht
f7376b8fd3
Merge branch 'vcmi:develop' into handicap 2024-07-29 23:10:20 +02:00
Laserlicht
3e5df61946 code review 2024-07-29 22:54:42 +02:00
Laserlicht
939dd62491
change variable name 2024-07-29 20:43:41 +02:00
Ivan Savenko
5f0e6f7ce1 Close all dialogs on start of new turn in MP 2024-07-29 17:13:31 +00:00
Ivan Savenko
434a2fb0fb Explicitly specify to use ranged or melee attack for damage estimation 2024-07-29 17:13:31 +00:00
Ivan Savenko
87b5f955d1 Fix some shortcuts not active during enemy turn in multiplayer 2024-07-29 17:13:31 +00:00
Ivan Savenko
74fea5109b Show non-learnable spells from rewardable object as greyed-out 2024-07-29 17:13:31 +00:00
Ivan Savenko
dac18ae35a
Merge pull request #4315 from IvanSavenko/map_overlay
Add overlay that shows map objects and their name & status
2024-07-29 18:56:53 +03:00
Laserlicht
6adc49b814
add help text 2024-07-29 00:54:58 +02:00
Laserlicht
c103d2a9f7
fix 2024-07-26 21:02:25 +02:00
Laserlicht
6e68dee955
fix 2024-07-26 20:54:44 +02:00
Laserlicht
53c0d20a57 fix campaign highscores 2024-07-26 20:36:52 +02:00
Laserlicht
e46f5f705b
better approach 2024-07-26 20:34:47 +02:00
Laserlicht
136f33f950 quickspell improvements 2024-07-26 20:11:14 +02:00
Laserlicht
2d100b00cd
check spellbook 2024-07-26 01:06:54 +02:00
Laserlicht
652e2ddf3f only host 2024-07-25 23:37:31 +02:00
Laserlicht
ecd7e17764 button 2024-07-25 23:32:45 +02:00
Laserlicht
ec005593d3 growth handicap 2024-07-25 23:04:59 +02:00
Laserlicht
bfd1e8a7c8 calculate income 2024-07-25 02:51:00 +02:00
Laserlicht
63b8ac1a58 fix 2024-07-25 00:45:52 +02:00
Laserlicht
d7ffc6ad3e cleanup 2024-07-25 00:28:49 +02:00
Laserlicht
d54dfe4508 gui improvements 2024-07-25 00:28:49 +02:00
Laserlicht
dc54261574 set handicap 2024-07-25 00:28:49 +02:00
Laserlicht
5310f94e99 gui input 2024-07-25 00:28:49 +02:00
Laserlicht
2b7e42004f basic gui 2024-07-25 00:28:49 +02:00
Laserlicht
268e0c8c44 change data structure 2024-07-25 00:28:49 +02:00
Laserlicht
fa7153b577 fix 2024-07-25 00:28:49 +02:00
Laserlicht
832e1531fc handycap percent 2024-07-25 00:28:49 +02:00
Laserlicht
48eacbf830 handicap percent 2024-07-25 00:28:49 +02:00
Laserlicht
97f49030d2 fix 2024-07-25 00:28:49 +02:00
Laserlicht
af2b6a0051 show handicap resources 2024-07-25 00:28:49 +02:00
Laserlicht
8edf77afcc basic handicap support 2024-07-25 00:28:01 +02:00
Andrii Danylchenko
da46d5d01b BattleAI: take into account defender dragon breath and other mutitarget attacks 2024-07-22 20:39:33 +03:00
Ivan Savenko
37cf788079
Merge pull request #4317 from IvanSavenko/split_townhandler
Split CTownHandler into smaller chunks
2024-07-22 17:42:48 +03:00
Ivan Savenko
4aa73b40c9 Split CTownHandler into smaller chunks 2024-07-21 18:21:48 +00:00
Ivan Savenko
550540f8ab
Merge pull request #4316 from IvanSavenko/crashfixes
Crashfixes
2024-07-21 16:15:28 +03:00
Ivan Savenko
4533271692
Merge pull request #4312 from IvanSavenko/texthandler_split
Split CGeneralTextHandler file into 1 file per class form
2024-07-21 13:49:14 +03:00
Ivan Savenko
398111f8d7
Merge pull request #4212 from alkazandzhiev/alkazandzhiev/saveMultiPlayerNames
Save all human player names in the configuration
2024-07-21 11:20:25 +03:00
Ivan Savenko
44f516d2fc Add overlay that shows map objects and their name & status 2024-07-20 18:47:20 +00:00
Ivan Savenko
5b9130c288 Fixes broken player-coloring on animations (e.g. hero in battle) 2024-07-20 18:28:47 +00:00
Ivan Savenko
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
Ivan Savenko
3c611ffa5b
Merge pull request #4307 from IvanSavenko/misc_fixes
Miscellaneous fixes
2024-07-20 12:56:10 +03:00
Ivan Savenko
08a6b859d2
Merge pull request #4304 from Laserlicht/quickspell-option
option to enable quickspell
2024-07-20 12:53:36 +03:00
Ivan Savenko
d59a5dad7d
Merge pull request #4299 from Laserlicht/input_modi_detection
input mode detection
2024-07-20 12:51:08 +03:00
Ivan Savenko
34204d5898
Merge pull request #4305 from Laserlicht/fix_search
fix search in quick spell spellbook
2024-07-20 12:50:43 +03:00
Aleksandar Kazandzhiev
cde9bed5a6 Use std::vector::empty for non-zero size checking.
Use auto type for ocontainers iterations.
2024-07-20 12:16:13 +03:00
Ivan Savenko
2796931259 Fix credits scrolling 2024-07-20 08:28:35 +00:00
Ivan Savenko
8d4f8dcf9c Add unassigned by default hotkeys to show visitable or blocked tiles 2024-07-19 19:38:40 +00:00
Ivan Savenko
e862b9c868 Fix crash on opening creature window with bonuses that don't have icon 2024-07-19 19:37:22 +00:00
Ivan Savenko
75fd67a921 Fix mouse scroll not working in right-click popups 2024-07-19 19:36:05 +00:00
Ivan Savenko
1dec5e56a9 Fix cursor shadow option in battles 2024-07-19 19:35:39 +00:00
Laserlicht
598f1b0738 fix search in quick spell spellbook 2024-07-19 19:49:21 +02:00
Laserlicht
ee0cf58395 option to enable quickspell 2024-07-19 19:43:22 +02:00
Laserlicht
0e207e7f64 change naming 2024-07-19 17:58:23 +02:00
Laserlicht
994a065e29 change naming 2024-07-19 17:58:06 +02:00
Ivan Savenko
0d44bf1506 Fix build 2024-07-19 12:30:10 +00:00
Ivan Savenko
b256919dab Implemented per-surface alpha for images that have palettes with alpha 2024-07-19 12:03:29 +00:00
Ivan Savenko
c40eea6e10 Fix fade-in animation - per-surface alpha was not set correctly 2024-07-19 10:46:20 +00:00
Ivan Savenko
9f3663b7d4 Remove unused method 2024-07-19 10:08:50 +00:00
Ivan Savenko
4f8f217b49 Moved range highlight transforms to config file 2024-07-19 10:08:50 +00:00
Ivan Savenko
81c7c0ce24 Fixed loading of flipped and duplicate images in animations 2024-07-19 10:08:50 +00:00
Ivan Savenko
73e052b1d0 Fix merge 2024-07-19 10:08:50 +00:00
Ivan Savenko
e4bed98674 Replaced raw json nodes with ImageLocator class 2024-07-19 10:08:50 +00:00
Ivan Savenko
2f68beead1 Remove old code 2024-07-19 10:08:50 +00:00
Ivan Savenko
fd726523a2 Remove creations of custom animations in runtime 2024-07-19 10:08:50 +00:00
Ivan Savenko
5409936509 Fix build with older SDL 2024-07-19 10:08:50 +00:00
Ivan Savenko
0d6ec0d224 Reviewed usage of EBlitMode, now specified clearly in all cases 2024-07-19 10:08:50 +00:00
Ivan Savenko
f11c5f62e1 Remove no longer needed code 2024-07-19 10:08:50 +00:00
Ivan Savenko
b850b6339f Flipped images are now tracked by RenderHandler 2024-07-19 10:08:50 +00:00
Ivan Savenko
230add02e4 Remove no longer used code 2024-07-19 10:08:50 +00:00
Ivan Savenko
0e407540ec Fixed player-coloring on adventure map 2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b Unified naming of method to recolor UI element to current player scheme 2024-07-19 10:08:50 +00:00
Ivan Savenko
9f31ec5326 Restore previously disabled icons registry 2024-07-19 10:08:50 +00:00
Ivan Savenko
fcafe53da9 Restored previously disabled University code, add interface to notify
market-like objects
2024-07-19 10:08:50 +00:00
Ivan Savenko
c1ebb6b0e3 Try to use lazy loading for animations 2024-07-19 10:08:50 +00:00
Ivan Savenko
a8a330f39f Remove unused code and no longer needed caching 2024-07-19 10:08:50 +00:00
Ivan Savenko
47de9a62dc Created separate classes for shared, unchangeable image and image
manipulators owned by UI elements
2024-07-19 10:08:50 +00:00
Ivan Savenko
2b3e4e01ca Remove unused code 2024-07-19 10:08:50 +00:00
Ivan Savenko
600b06b74d Moved all handling of image loading to render handler 2024-07-19 10:08:50 +00:00
Ivan Savenko
a1fb3b8b01 Reduce direct access to CAnimation, removed various caching schemes 2024-07-19 10:08:50 +00:00
Ivan Savenko
56f1725234 All images are now loaded via RenderHandler class 2024-07-19 10:08:50 +00:00
Ivan Savenko
2020d96070
Merge pull request #4071 from IvanSavenko/fix_rng_syncronization
[1.6] Fix potential desync if client uses different stdlib with different random number generators
2024-07-19 13:08:09 +03:00
Laserlicht
ac30f7757b changed naming 2024-07-19 11:41:00 +02:00
Laserlicht
68213eb5a0 touch tutorial only if touch used 2024-07-19 04:16:43 +02:00
Laserlicht
26b164b7ca change naming 2024-07-19 03:44:45 +02:00
Laserlicht
fb980bdb74 fix 2024-07-19 03:28:33 +02:00
Laserlicht
76fc821f82 click also change of modi; haptic only with touch 2024-07-19 03:16:56 +02:00
Laserlicht
5dae5ed30e input modi detection 2024-07-19 03:00:19 +02:00
Laserlicht
9ac7db24ca
Merge branch 'develop' into quickspell 2024-07-18 21:24:42 +02:00
Ivan Savenko
d02251f6a8
Merge pull request #4263 from Alexander-Wilms/json-error
JsonParser::parse(): Print file name if there were errors while parsing
2024-07-18 21:28:44 +03:00
Ivan Savenko
d55c4e3973
Merge pull request #4275 from IvanSavenko/music_modding
Additional options for music modding
2024-07-18 21:28:04 +03:00
Ivan Savenko
37284efd74
Merge pull request #4278 from IvanSavenko/video_fixes
Video playback fixes
2024-07-18 21:18:39 +03:00
Andrii Danylchenko
37dc2a38e8 NKAI: reduce double army loss cases 2024-07-18 13:38:25 +03:00
Andrii Danylchenko
73ea0ce7bc
Merge pull request #4289 from vcmi/fix-gosolo-for-multiplayer
NKAI: fix gosolo when human is lead by gosolo AI + multiplayer
2024-07-18 08:02:16 +03:00
Laserlicht
e629b7a371 reduce to 12 with gap 2024-07-17 19:26:18 +02:00
Aleksandar Kazandzhiev
551b87e2cd Add up to 8 human player names to the configuration and save/load them to avoid entering them each time.
Avoid a crash when all names are deleted in the multiplayer names editing dialog.
2024-07-17 20:04:20 +03:00
Laserlicht
4415f645a7 lambda -> function; fix color 2024-07-17 18:07:45 +02:00
Andrii Danylchenko
7571fb7046 NKAI: fix gosolo when human is lead by gosolo AI + multiplayer 2024-07-17 17:09:04 +03:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Laserlicht
2dd22c383b make inactive buttons darker 2024-07-17 14:05:14 +02:00
Ivan Savenko
becd13e03d Fix page flip animation playback 2024-07-17 11:57:03 +00:00
Alexander Wilms
434371195d JsonNode constructors: Take fileName as argument
* Don't print JSON in JsonParser::parse() in case of errors
2024-07-17 13:50:59 +02:00
Laserlicht
f0435d8b8e small fix 2024-07-17 13:48:00 +02:00
Laserlicht
f54b84ead9 use spellbook to select 2024-07-17 13:20:17 +02:00
Laserlicht
5562402646 hotkey number from config 2024-07-17 12:37:23 +02:00
Laserlicht
b8d872aa60 mobile adjustments 2024-07-17 04:24:27 +02:00
Laserlicht
b568e2f628
Merge branch 'vcmi:develop' into quickspell 2024-07-17 03:20:31 +02:00
Laserlicht
d23d4b32c7 cleanup 2024-07-17 01:02:11 +02:00
Laserlicht
0a98169bcf update quick spell panel 2024-07-17 00:55:01 +02:00
Laserlicht
a3874297f5 toggle window 2024-07-17 00:48:22 +02:00
Laserlicht
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
Laserlicht
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
Ivan Savenko
1c63fefe02 Moved banks randomization to server-side with client netpack 2024-07-16 13:13:39 +00:00
Ivan Savenko
b07408e984 New objects are now created and initialized on server and sent to client 2024-07-16 13:13:39 +00:00
Ivan Savenko
d2839c8e52 Rewardable object randomization is now always server-sided 2024-07-16 13:13:39 +00:00
Ivan Savenko
0d66ddbeec GameState now uses random generator from server. Blocked access to rmg
on client
2024-07-16 13:13:38 +00:00
Ivan Savenko
63bcf7d83c Replaced most of usages of CRandomGenerator with vstd::RNG in library 2024-07-16 13:13:07 +00:00
Ivan Savenko
7328c9ffd6 Fix path and music not updating on new turn 2024-07-16 13:08:15 +00:00
Ivan Savenko
e4be4c3061 Fix playback of 8-bit audio found in h3intro.smk in some version not
from gog.com
2024-07-16 12:49:24 +00:00
Ivan Savenko
29d3de2807 Fix missing video on winning the battle 2024-07-16 11:41:40 +00:00
Ivan Savenko
e59880a37c Remove unnecessary logging 2024-07-16 09:53:56 +00:00
Ivan Savenko
a273eb6413 Fix crash on attempt to play audio from video without such stream 2024-07-16 09:53:56 +00:00
Ivan Savenko
ad9750ed3e
Merge pull request #4186 from SoundSSGood/end-of-battle-artifacts-transfer
End of battle artifacts transfer
2024-07-16 12:45:13 +03:00
Ivan Savenko
696cce7f7f
Merge pull request #4253 from smanolloff/random-port
Bind VCMI server to a random TCP port
2024-07-16 12:25:29 +03:00
Ivan Savenko
fd04320815
Merge pull request #4267 from IvanSavenko/sonar_fix
Fixed new issues detected by SonarCloud
2024-07-16 12:23:08 +03:00
Ivan Savenko
f920e94366
Merge pull request #4210 from Laserlicht/graphics_improvements
[1.6] Graphics improvements
2024-07-16 12:17:39 +03:00
Ivan Savenko
3134d8383c
Merge pull request #4207 from Laserlicht/map_format_additional
[1.6] Map format additional infos
2024-07-16 12:15:58 +03:00
Ivan Savenko
4e48d70537
Merge pull request #4265 from dydzio0614/alternative-actions-fix
Fix alternative actions to support more than 2 actions + simplify logic
2024-07-16 12:14:46 +03:00
Ivan Savenko
9c5d5d7c5a It is now possible to define custom battle opening sound and custom music
for a battlefield
2024-07-15 21:46:23 +00:00
Ivan Savenko
358008fca9 It is now possible to define multiple town themes 2024-07-15 21:45:51 +00:00
SoundSSGood
ff5ddd76b7 suggestions 2024-07-16 00:03:06 +03:00
Dydzio
037ee4395e Allow opening single hero when two heroes in town via shift+click 2024-07-15 20:22:19 +02:00
Ivan Savenko
c00a1e1b0c Fixed new issues detected by SonarCloud 2024-07-15 07:46:40 +00:00
Dydzio
6119898932 Add some useful comments 2024-07-15 09:39:22 +02:00
Laserlicht
6aa7c9ebf9
code review 2024-07-15 00:51:41 +02:00
Dydzio
3836f132d3 Fix alternative actions to support more than 2 actions + simplify logic 2024-07-15 00:41:05 +02:00
Simeon Manolov
d997d18438
remove debug line 2024-07-12 15:41:07 +03:00
Simeon Manolov
4be7adbf0a
add missing include 2024-07-12 15:26:31 +03:00
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