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

4574 Commits

Author SHA1 Message Date
Michael
aaa115cf4b
Button-Sound -> haptic feedback 2023-07-29 00:11:16 +02:00
Ivan Savenko
6c52293dd9
Merge pull request #2425 from IvanSavenko/fix_combat_replay
Attempt to fix combat replay queries
2023-07-29 00:03:44 +03:00
Ivan Savenko
aed8c411fc Minor rework & cleanup of combat replays 2023-07-27 19:25:55 +03:00
Dydzio
0b5cea0320 Use new adventure map state to detect opponent human turn 2023-07-27 17:26:52 +02:00
Dydzio
ff1a635e9e Unblock basic adventure map actions (scrolling / right-click) in multiplayer 2023-07-26 21:20:11 +02:00
Ivan Savenko
ff2ae1d2d3
Merge pull request #2414 from IvanSavenko/fix_autocombat_crash
Fix autocombat crash
2023-07-26 02:02:28 +03:00
Ivan Savenko
32f7a95e38 Use capture by value since thread might start after local method returns 2023-07-25 22:33:59 +03:00
Ivan Savenko
1335a834e2
Merge pull request #2408 from IvanSavenko/remove_log_warning
Remove log warning
2023-07-25 18:15:52 +03:00
Ivan Savenko
eccd8590f5
Merge pull request #2406 from IvanSavenko/fix_mutex
Fix game hang/crash on locking mutex
2023-07-25 18:15:37 +03:00
Ivan Savenko
705cdb846d
Merge pull request #2403 from IvanSavenko/error_detection_fix
Attempt to fix & improve error reporting
2023-07-25 18:15:28 +03:00
Ivan Savenko
823080be86 Fix error on opening map list with hota maps 2023-07-24 23:27:26 +03:00
Ivan Savenko
f827571f9b Fix assertion failure on exit due to mutex lock 2023-07-24 23:01:44 +03:00
Ivan Savenko
be3ed014a7
Merge pull request #2404 from dydzio0614/autosave-fix
End turn autosave fix
2023-07-24 22:26:43 +03:00
DjWarmonger
9b3618b664
Merge pull request #2378 from vcmi/default_template_to_random
Rename default map template to random map template
2023-07-24 19:16:02 +02:00
Dydzio
a4f9cde57d Fix autosave at end of turn starting with AI turn on load 2023-07-24 18:24:57 +02:00
Ivan Savenko
21e794268b Attempt to fix & improve error detection:
- use std::fstream instead of boost::iostreams for properly working flush
- removed some catch-all blocks
- reduce catch scope of some try/catch blocks to clearly indicate intent
2023-07-24 18:48:56 +03:00
Tomasz Zieliński
d26e46ddfe Remove old id, replace with randomTemplate 2023-07-24 17:39:32 +02:00
Ivan Savenko
a280cc8845
Merge pull request #2384 from IvanSavenko/bugfixing_beta
Bugfixing iteration
2023-07-24 00:49:34 +03:00
Ivan Savenko
558855b772
Merge pull request #2387 from Laserlicht/patch-3
allow clipboard paste
2023-07-24 00:49:19 +03:00
Ivan Savenko
8dd1545e25
Merge pull request #2390 from dydzio0614/hero-window-mana-fix
Fix for hero info window mana points not getting spent on spellcast - option 1
2023-07-24 00:48:54 +03:00
Michael
ce00069dcd
haptic feedback on radial menu action 2023-07-23 15:17:30 +02:00
Ivan Savenko
639880a426 Fix handling of tactics by AI 2023-07-23 14:03:22 +03:00
Ivan Savenko
112a40a254 Fix pinch gesture on mobile? 2023-07-23 11:46:11 +03:00
Dydzio
47b6358e6e Improve feature by triggering hero window refresh in response to netpack 2023-07-22 21:51:14 +02:00
Ivan Savenko
5be4f6ec2f Fix visibility of creature amount label after casting spell before turn 2023-07-22 22:49:48 +03:00
Ivan Savenko
01d588ab54 Fix keyboard shortcuts on selection dialogs 2023-07-22 22:29:05 +03:00
Dydzio
05735a20e1 Fix for hero info window mana points not getting spent on spellcast 2023-07-22 15:32:00 +02:00
Michael
e8771e40a5
Update client/eventsSDL/InputSourceKeyboard.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-22 14:36:13 +02:00
Michael
746f8c5e62
added missing check for ctrl 2023-07-22 14:26:37 +02:00
Michael
59f3740aea
allow clipboard paste 2023-07-22 13:17:16 +02:00
Ivan Savenko
a912770e29 Fix activation of radial menu on touchscreen 2023-07-22 12:33:05 +03:00
Ivan Savenko
e6d8b65e2c Fix toggling of auto combat 2023-07-22 12:15:27 +03:00
Ivan Savenko
1acc936e51 Do not activate radial wheel if cursor stays in the center 2023-07-21 17:01:53 +03:00
Ivan Savenko
6cd219738b Added option to disable radial wheel in config (no UI) 2023-07-21 15:47:42 +03:00
Ivan Savenko
3a3306863a Moved new texts to config 2023-07-21 15:47:42 +03:00
Ivan Savenko
e2ad8bbf58 Added initial version of selection highlight 2023-07-21 15:47:42 +03:00
Ivan Savenko
816adecca0 Added "split stack" action to wheel 2023-07-21 15:47:42 +03:00
Ivan Savenko
cb28a90a3b Create items only if action is possible 2023-07-21 15:47:42 +03:00
Ivan Savenko
a45a0d1c40 Activate nearest radial menu item, even if not hovered 2023-07-21 15:47:42 +03:00
Ivan Savenko
5b2ac27e90 Fix slot positioning 2023-07-21 15:47:42 +03:00
Ivan Savenko
f3508bdfda Show option description on hovering 2023-07-21 15:47:42 +03:00
Ivan Savenko
8c4faa24f4 Add alpha channel to radial menu items 2023-07-21 15:47:42 +03:00
Ivan Savenko
e3f5ab57f2 Fixed input event ordering. Fixes radial menu show/hide logic 2023-07-21 15:47:42 +03:00
Ivan Savenko
d26595cef7 Radial menu is now a proper window. Minor fixes to positioning. 2023-07-21 15:47:42 +03:00
Ivan Savenko
a494dc4870 Refactoring of CGarrisonInt 2023-07-21 15:47:42 +03:00
Ivan Savenko
dca3785f84 Initial version of radial wheel for army management 2023-07-21 15:47:42 +03:00
Ivan Savenko
cefbe5152e
Merge pull request #2359 from IvanSavenko/crashfixing
Fix crashes from 1.2.1 statistics on Google Play
2023-07-21 15:44:37 +03:00
Ivan Savenko
692c40c0f3
Merge pull request #2364 from Laserlicht/map-select-popup
Mapselection - popup
2023-07-21 15:44:18 +03:00
Ivan Savenko
3f4e88c396
Merge pull request #2325 from SoundSSGood/hero-backpack-window
Hero backpack window prototyping
2023-07-21 15:43:34 +03:00
Michael
0f16cec3b9
whitespace 2023-07-20 22:05:09 +02:00
Michael
f313597968
Use boost::format 2023-07-20 22:02:39 +02:00
Michael
36e870ae45
Descriptions 2023-07-20 21:37:23 +02:00
Michael
a86406d090
check list length 2023-07-20 02:20:54 +02:00
Michael
3484059a40
fix indentation 2023-07-20 02:01:00 +02:00
Michael
c28c0d2a13
Popup - Mapselection 2023-07-20 01:53:33 +02:00
Ivan Savenko
280085b95d
Merge pull request #2308 from IvanSavenko/remove_client_savegame
Remove client savegames
2023-07-19 14:46:46 +03:00
Ivan Savenko
ddda46a7fd
Merge pull request #2358 from dydzio0614/persistent-hero-info-window
Add option for persistent hero info window as in HD mod
2023-07-19 14:46:16 +03:00
Ivan Savenko
ab6a4be105
Merge pull request #2357 from SoundSSGood/picked-art-fix
Fixed hero skills if artifact picked
2023-07-19 14:45:58 +03:00
Ivan Savenko
07a8c75bec
Merge pull request #2305 from dydzio0614/unlimited-autosave
Ability to change autosave limit + set autosave prefix
2023-07-19 14:45:51 +03:00
Ivan Savenko
9e58f67ab5 Fix autocombat AI threading 2023-07-19 12:09:03 +03:00
Ivan Savenko
556763fb7b Fixed handling of tactics 2023-07-18 22:02:35 +03:00
SoundSSGood
ca977d7105 backpack window slider 2023-07-18 21:01:55 +03:00
Ivan Savenko
79be1c66fb Fix quick combat regression 2023-07-18 20:06:39 +03:00
Ivan Savenko
1bf6bbd9b6 Significantly simplified threading model in battles 2023-07-18 19:55:59 +03:00
Ivan Savenko
f27f5ebc7c Split BattleAI::activeStack into several smaller methods 2023-07-18 17:35:19 +03:00
Ivan Savenko
5e8a778e7d Attempt to fix / trace crashes from Google Play statistics 2023-07-18 17:31:21 +03:00
Ivan Savenko
c7d88271a9 Removed asynchronous calls from exchange window 2023-07-18 17:31:21 +03:00
Ivan Savenko
bb17cc13b1 Implemented lazy totalRedraw to prevent multiple redraws on single frame 2023-07-18 17:31:21 +03:00
Ivan Savenko
9168a1150f Remove catch-all that only blocks debugging (and Google Play reports) 2023-07-18 17:31:21 +03:00
Ivan Savenko
7b06c41929
Merge pull request #2338 from dydzio0614/info-box-army-management
Info box army management
2023-07-18 16:45:17 +03:00
Dydzio
f4f789804d
Update client/battle/BattleWindow.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-18 15:15:58 +02:00
Ivan Savenko
1e155c1ac7
Merge pull request #2355 from IvanSavenko/bugfixing
Bugfixing iteration
2023-07-18 16:06:00 +03:00
Ivan Savenko
317183e00d
Merge branch 'develop' into info-box-army-management 2023-07-18 16:05:09 +03:00
Ivan Savenko
e0977693b0
Merge pull request #2336 from IvanSavenko/left_button_map_drag
Left button map drag
2023-07-18 16:03:05 +03:00
Dydzio
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +02:00
SoundSSGood
ff278d5f3a cleanup unused 2023-07-17 22:26:21 +03:00
SoundSSGood
f33dec9337 picked art fixed 2023-07-17 22:24:43 +03:00
Ivan Savenko
64a22d8590 Workaround for false double-clicking of elements in hero/town lists 2023-07-17 17:40:28 +03:00
Ivan Savenko
36efef0ee3 Do not play new day animation on game start 2023-07-17 16:30:12 +03:00
SoundSSGood
b1351d8532 two scrolling modes demo 2023-07-16 21:16:12 +03:00
Dydzio
ee663b1595 Changes from code review 2023-07-16 15:56:42 +02:00
Dydzio
1b676933e5
Fix indent
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-16 15:46:43 +02:00
Dydzio
5882cbae78 Merge branch 'develop' into unlimited-autosave 2023-07-16 15:19:04 +02:00
Dydzio
fe26ab4501 Add settings entry, immediately refresh info bar on setting toggle 2023-07-16 14:52:43 +02:00
Ivan Savenko
61750d30c2 Implemented dragging map via left mouse click (off by default) 2023-07-16 12:00:40 +03:00
Dydzio
f8fbafff2f Fix github #2335 - town garrison not updating in info box 2023-07-16 10:18:43 +02:00
Dydzio
dbfcb5a749 Implement interactable town tooltip 2023-07-16 10:17:37 +02:00
Dydzio
013d4cd208 Fix slot deselect when selected shortly after new day animation bypass 2023-07-15 23:15:59 +02:00
Dydzio
ea0ee87299 Interactable hero status - alternative infobox component 2023-07-15 23:14:59 +02:00
Dydzio
484d03334c New garrison interface layout: Reversed two rows + labels below slot 2023-07-15 23:11:21 +02:00
Michael
4e242f98fd
Battleintro: Skip with mouse button 2023-07-15 21:18:04 +02:00
SoundSSGood
9427de6344 initial files 2023-07-15 22:15:32 +03:00
SoundSSGood
3ea6f530ad backpack window initial 2023-07-15 22:15:32 +03:00
Ivan Savenko
a4ba5a9b65
Merge pull request #2327 from IvanSavenko/bugfixing_from_stream
Fix accumulated minor bugs
2023-07-15 21:55:19 +03:00
Dydzio
1711b3848f Remove unused variable 2023-07-15 20:03:07 +02:00
Ivan Savenko
3c0037efca Fix dismissing hero from opening hero window in town window that is
opened in kindom overview window
2023-07-15 16:09:44 +03:00
Ivan Savenko
8129cbc514 Allow dismissing hero from town 2023-07-15 16:09:44 +03:00
Ivan Savenko
3e8debc243 Allow dismissing heroes from kingdom overview window 2023-07-15 16:09:44 +03:00
Ivan Savenko
189a0c6e0d Re-center map on active object after screen resize 2023-07-15 16:09:44 +03:00
Ivan Savenko
8a92941681 Allow merging stack on recruitment to give place for recruited unit 2023-07-15 16:09:44 +03:00
Ivan Savenko
366239bf8d Do not play movement sound on non-movement actions 2023-07-15 16:09:44 +03:00
Ivan Savenko
8dc009e2c9 Always show correct game resolution in settings, unaffected by scaling 2023-07-15 16:09:44 +03:00
Ivan Savenko
e4e353449e Recreate screen on UI scaling change 2023-07-15 16:09:44 +03:00
Ivan Savenko
c0f0c3cedd Fix shortcuts not working sometimes 2023-07-15 16:09:44 +03:00
Ivan Savenko
0ec9af7d9b Replaced WoG opening with H3:SoD files 2023-07-15 16:09:44 +03:00
Ivan Savenko
3836217da5 Fix updating of heroes when moving to/from garrison 2023-07-15 16:09:44 +03:00
Ivan Savenko
3e1125570d Fix updating of hero & town lists on adventure map 2023-07-15 16:09:44 +03:00
Michael
bea6effcb7
haptic feedback only if menu opens
fix
2023-07-14 22:49:44 +02:00
Michael
c6e860720e
haptic feedback only if menu opens 2023-07-14 22:47:13 +02:00
Dydzio
ad66acdd79 End turn autosave support + making it default 2023-07-13 22:07:42 +02:00
Dydzio
616916714a Unrelated typo fix 2023-07-13 21:56:53 +02:00
Dydzio
404ab23bc6 Get autosave day without leading 0, delete ancient saveprefix stuff 2023-07-13 21:55:51 +02:00
Dydzio
bcb061b58f Merge branch 'develop' into unlimited-autosave 2023-07-13 20:53:10 +02:00
Ivan Savenko
9ef959a7f8
Merge pull request #2310 from IvanSavenko/left_click_refactor
Left click input refactor
2023-07-13 13:03:06 +03:00
Ivan Savenko
fb00bf4067
Merge pull request #2322 from dydzio0614/resolution-fix
Fix for fullscreen game always starting in native resolution
2023-07-13 12:57:32 +03:00
Ivan Savenko
c2845d120b
Merge pull request #2324 from mikeiit/develop
Fixed selection update in saving screen
2023-07-13 12:57:06 +03:00
Ivan Savenko
b30db5fc1f
Merge pull request #2301 from Laserlicht/haptic_feedback
Haptic feedback
2023-07-13 12:56:54 +03:00
Michael
1abd8bbe92
Update client/windows/settings/GeneralOptionsTab.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-12 22:56:35 +02:00
Mike
3c707d8e31 Cleanup 2023-07-11 23:12:59 -07:00
Mike
5134583111 Added missing redraw after selection update 2023-07-11 23:10:02 -07:00
Mike
90397a9604 Merge remote-tracking branch 'upstream/develop' into develop 2023-07-11 19:06:21 -07:00
Dydzio
42db24b4b2 Fix for fullscreen game always starting in native resolution 2023-07-11 17:59:22 +02:00
Ivan Savenko
9acab48bc3
Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
2023-07-11 14:36:08 +03:00
Ivan Savenko
78415c573b
Merge pull request #2289 from IvanSavenko/resolution_fixes
Fix issues with changing game resolution
2023-07-11 14:35:07 +03:00
DjWarmonger
f6cc61e0be
Merge pull request #2297 from vcmi/rmg_roads
Rmg roads
2023-07-11 09:25:24 +02:00
Ivan Savenko
d99fab8496 Reduce usage of getCursorPosition 2023-07-09 18:09:22 +03:00
Ivan Savenko
0deeff30b9 replaced clickPressed with clickReleased where applicable to H3 2023-07-09 17:55:39 +03:00
Ivan Savenko
18db944083 Replaced clickReleased with clickPressed where applicable in H3 2023-07-09 17:48:25 +03:00
Ivan Savenko
9449899098 Fix regressions 2023-07-09 17:08:37 +03:00
Ivan Savenko
8750aa2c5b Merged server savegame and (broken and unused) client savegame files 2023-07-09 15:30:47 +03:00
Mike
b327f890f2 Partially fixed initial loading of save file
Brought back the missing save file info in the info card. Still need to fix the input text box and selection highlight.
2023-07-08 23:00:48 -07:00
Dydzio
fbf0bf78d6 Configurable autosave limit and prefix - ingame handling 2023-07-08 23:04:01 +02:00
Michael
d911756827
changes from code review 2023-07-08 21:02:03 +02:00
Michael
70b7f992de
fix 2023-07-08 20:34:11 +02:00
Michael
06541211d5
Rename var 2023-07-08 19:11:26 +02:00
Michael
050a22c257
only pop up for now 2023-07-08 18:50:59 +02:00
Michael
ff51b8f46b
Setting for haptic feedback 2023-07-08 18:47:38 +02:00
Michael
da8bcdd2dd
ios Support 2023-07-08 18:15:36 +02:00
Michael
a5fe6cc80b
hapticFeedback 2023-07-08 17:02:44 +02:00
Ivan Savenko
ca889a5c2a Replaced clickLeft with clickPressed clickReleased methods 2023-07-08 14:33:04 +03:00
Tomasz Zieliński
730b36612c Respect GUI settings for roads. By default, all road types are enabled. 2023-07-08 08:44:10 +02:00
Ivan Savenko
2a634b2ec0 Fixed UI updates on switching to/from fullscreen 2023-07-07 15:26:42 +03:00
Ivan Savenko
7e00a702c1 Fix switching to exclusive fullscreen to borderless windowed 2023-07-07 14:29:03 +03:00
Ivan Savenko
0c83e34093 Implemented reserved area for iOS notch / cutout 2023-07-07 14:29:03 +03:00
Ivan Savenko
5143ca266d Moved SDL renderer access to ScreenHandler class 2023-07-07 14:29:03 +03:00
Ivan Savenko
fa4a0004b2
Merge pull request #2291 from IvanSavenko/terrain_animations_config
Moved hardcoded terrain palette-cycling animations to config
2023-07-07 14:28:39 +03:00
Ivan Savenko
ae8579558d
Merge pull request #2282 from IvanSavenko/adventure_map_fixes
Adventure map fixes for 1.3
2023-07-07 14:27:58 +03:00
Ivan Savenko
a9d25b0109 Fix map grid visibility on game load 2023-07-07 01:27:57 +03:00
Ivan Savenko
41755c9d87 Fix slider scroll via UI buttons 2023-07-07 01:23:17 +03:00
Mike
6414e3b3fc Changed resource cost value label position 2023-07-05 18:43:52 -07:00