Laserlicht
e629b7a371
reduce to 12 with gap
2024-07-17 19:26:18 +02:00
Laserlicht
4415f645a7
lambda -> function; fix color
2024-07-17 18:07:45 +02: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
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
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
29d3de2807
Fix missing video on winning the battle
2024-07-16 11:41:40 +00: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
Dydzio
6119898932
Add some useful comments
2024-07-15 09:39:22 +02:00
Dydzio
3836f132d3
Fix alternative actions to support more than 2 actions + simplify logic
2024-07-15 00:41:05 +02: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
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
b4c6906471
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-06-11 19:22:23 +00:00
Ivan Savenko
b8beb4fb13
Fixes for various minor issues detected by Sonar Cloud
2024-06-01 11:48:30 +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
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
2aec3cde2c
Fix possible crash on replaying combat after manual run
2024-05-23 12:46:28 +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
Ivan Savenko
ffe14fc1fc
Merge pull request #4022 from vcmi/master
...
Merge master -> beta
2024-05-20 18:09:51 +03:00
Ivan Savenko
0db8266495
Implemented some of the requested shortcuts
2024-05-19 09:12:36 +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
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
Ivan Savenko
721b15d9de
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-05-17 08:26:37 +00:00
Ivan Savenko
540bd16e7b
Fixed video widget playback
2024-05-16 16:50:36 +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
Laserlicht
f596fbc9b3
Apply suggestions from code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-05-14 12:44:08 +02:00
Laserlicht
e06c09d709
battle log expansion
2024-05-14 02:50:57 +02: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
