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

12783 Commits

Author SHA1 Message Date
nordsoft
7dc1717ec6 Handle timer for tactic phase 2023-08-28 19:45:15 +04:00
nordsoft
4ee47b01ae Make possible to play with different timers independently 2023-08-28 19:45:15 +04:00
nordsoft
6226ddf4a7 Fix potential concurrenccy issues 2023-08-28 19:45:15 +04:00
Nordsoft91
2022d55d40
Merge pull request #2692 from Nordsoft91/accept-turn
Accept turn query
2023-08-28 19:44:46 +04:00
nordsoft
71cbb0e2e7 Change query reply method 2023-08-28 18:56:36 +04:00
nordsoft
98f7ed9dfd Implement player start turn query 2023-08-28 18:56:36 +04:00
Nordsoft91
8e9dd697ff
Merge pull request #2674 from Nordsoft91/turn-timer
Chess Timer UI and battle timer fixes
2023-08-28 18:53:41 +04:00
nordsoft
93f14c984d Fix compatibility check with patch version 2023-08-28 17:49:13 +04:00
nordsoft
925bde68ff Fix compatibility check with game version 2023-08-28 17:43:33 +04:00
nordsoft
0a6ea63b09 Revert "Add compatibility with minor version"
This reverts commit 6e7b13fcbe.
2023-08-28 17:41:00 +04:00
nordsoft
084122bc80 Fix compiling 2023-08-28 17:26:16 +04:00
nordsoft
78397d6d1a Fix compiling 2023-08-28 17:21:38 +04:00
nordsoft
439254f921 Fix mistake 2023-08-28 17:21:38 +04:00
nordsoft
49a76ac14c Code review tweaks 2023-08-28 17:21:38 +04:00
nordsoft
44791b6665 Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9"
This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.
2023-08-28 17:21:38 +04:00
nordsoft
899cf5ee99 Update mods repo link for android 2023-08-28 17:21:38 +04:00
nordsoft
86ab97c64f Fix stop on flight for timer 2023-08-28 17:21:38 +04:00
nordsoft
de8bd48398 Added right click pop-up for text inputs 2023-08-28 17:21:38 +04:00
nordsoft
614a285fb8 Fix hot seat timer visualization 2023-08-28 17:21:38 +04:00
nordsoft
e4e9bcfb9b Show time for other player during battle 2023-08-28 17:19:04 +04:00
nordsoft
0bb352565a Fix creature timer update 2023-08-28 17:12:08 +04:00
nordsoft
0bc2302f1f Fix battle timer logic 2023-08-28 17:12:08 +04:00
nordsoft
fdaf05514a Correct network data exchange and time parsing 2023-08-28 17:10:52 +04:00
nordsoft
3962b71262 Remove unused variable 2023-08-28 17:10:52 +04:00
nordsoft
6380a02e10 Upgrade launcher default repo 2023-08-28 17:10:52 +04:00
nordsoft
1e527a6942 Minor changes 2023-08-28 17:10:52 +04:00
nordsoft
86e0ea15fb Fix turn timer settings 2023-08-28 17:10:52 +04:00
nordsoft
d758727c23 Basic timer ui is almost complete 2023-08-28 17:10:52 +04:00
nordsoft
c7ded69edc Minor changes 2023-08-28 17:10:52 +04:00
nordsoft
c064b805c2 Refactor combo box 2023-08-28 17:10:52 +04:00
nordsoft
39fbdd300d Refactor combo box 2023-08-28 17:10:52 +04:00
Nordsoft91
1586c6c6a0
Merge pull request #2668 from IvanSavenko/remove_current_player
Remove "currentPlayer" from gamestate
2023-08-28 17:10:28 +04:00
Nordsoft91
6394a77270
Merge pull request #2683 from Laserlicht/zoom_dead_area
dead area for zooming
2023-08-28 17:09:15 +04:00
Nordsoft91
ffc4b989f0
Merge pull request #2679 from Laserlicht/smooth_scroll
Smooth scroll
2023-08-28 17:08:57 +04:00
nordsoft
6e7b13fcbe Add compatibility with minor version 2023-08-28 16:21:46 +04:00
Michael
3c1892a7d2
adjust timing 2023-08-28 10:03:50 +02:00
Michael
220145bd9b
reintroduce setting to zero while holding 2023-08-28 00:59:08 +02:00
Michael
9f51f42128
use fps in calculation 2023-08-28 00:49:32 +02:00
Michael
b61890355f
Update MapViewController.cpp 2023-08-27 23:17:47 +02:00
Dydzio
cba9ddd66a
Update client/battle/BattleActionsController.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-08-27 23:01:04 +02:00
Michael
1c89c71031
Update MapViewController.cpp 2023-08-27 22:55:05 +02:00
Michael
3ce9d022d5
try to remove glitch 2023-08-27 22:00:20 +02:00
Michael
da3014bd54
Haptic feedback and increased dead zone 2023-08-27 21:40:56 +02:00
Ivan Savenko
790a5680e5
Merge pull request #2669 from SoundSSGood/backpack-window-fix
Backpack window fix
2023-08-27 22:07:22 +03:00
Ivan Savenko
6896ee5370
Merge pull request #2681 from IvanSavenko/fix_player_color_regression
Fix checking PlayerColor's for validness
2023-08-27 22:01:23 +03:00
Michael
3960e5aa32
Update client/mapView/MapView.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-08-27 20:55:37 +02:00
nordsoft
3e502955b3 Support FilledTexturePlayerColored in configurable interface 2023-08-27 22:34:02 +04:00
Dydzio
321c9c2ca6 Remove now unused enum 2023-08-27 20:18:19 +02:00
Andrii Danylchenko
4b807e01f1 BattleAI: fix freeze 2023-08-27 21:03:55 +03:00
Andrii Danylchenko
2fef0e8d40 Fix market of time, crashes game 2023-08-27 21:01:32 +03:00