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

707 Commits

Author SHA1 Message Date
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
Alexander Wilms
02e429e973 Fix typos using https://github.com/crate-ci/typos
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Ivan Savenko
3bea383b59 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-21 12:58:36 +00:00
Ivan Savenko
4f64b1f7e6 Try to localize crash on missing combat animation 2024-06-17 13:24:07 +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
b92f0c5619 Fix UI glitch due slots recreation & repositioning 2024-06-04 14:41:33 +00:00
Ivan Savenko
b8beb4fb13 Fixes for various minor issues detected by Sonar Cloud 2024-06-01 11:48:30 +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
SoundSSGood
07239dcfb5 artifact parts calc 2024-05-24 21:22:08 +02:00
SoundSSGood
3692ca25ed CArtifactsOfHeroBase refactoring 2024-05-21 12:05:07 +03:00
SoundSSGood
03aaf849f0 CWindowWithArtifacts remove std::variant 2024-05-20 15:15:46 +03:00
SoundSSGood
0501073d4c Artifacts altar ctrl+click 2024-05-20 11:47:12 +03:00
Ivan Savenko
d965226cbd Moved Exchange Window to new file, no functionality changes 2024-05-19 10:53:56 +00:00
Ivan Savenko
88fbb7ee71 Most of buttons created in cpp now have assigned shortcut 2024-05-19 09:12:36 +00:00
Ivan Savenko
947d07faa4 Add separate shortcuts for saving and loading of artifact costumes 2024-05-18 16:27:42 +00:00
Ivan Savenko
7461df161c lib now uses shared_ptr for entities. Removed manual memory management. 2024-05-17 15:04:05 +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
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
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
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
fe4b4a4fba Hopefully better logic for on-screen keyboard visibility 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
da9d82b697
Merge pull request #3973 from vcmi/master
Merge master -> beta
2024-05-14 16:59:10 +03: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
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
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
2ddb41e654 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-10 08:09:51 +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
74d3b4ab43 Added block for several more actions outside of our turn 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