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

6115 Commits

Author SHA1 Message Date
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