1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-30 08:57:00 +02:00
Commit Graph

4728 Commits

Author SHA1 Message Date
Michael
3593911dde
improve readability 2023-08-31 21:00:02 +02:00
Michael
31e0558809
remove unneeded headers 2023-08-30 21:43:59 +02:00
Michael
e650f0100b
setting + all non popups 2023-08-30 21:41:28 +02:00
Michael
1d6469ab36
battlewindow 2023-08-29 22:43:37 +02:00
Michael
40c7ddcaf4
dim adventuremap 2023-08-29 22:22:22 +02:00
Ivan Savenko
695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
Ivan Savenko
eafa9cbae1
Merge pull request #2684 from dydzio0614/creature-spellcasting-fixes
Better default stack action handling + "F shortcut" mode fixes
2023-08-28 20:01:04 +03:00
Ivan Savenko
5be87b30c1
Merge pull request #2625 from dydzio0614/artifacts-backpack-gui
Artifacts backpack GUI
2023-08-28 19:59:11 +03:00
Ivan Savenko
a30939ad8e
Merge pull request #2685 from dydzio0614/mana-drain-ui-refresh
Fix mana drain not refreshing battle hero window mana
2023-08-28 19:56:29 +03: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
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
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
fdaf05514a Correct network data exchange and time parsing 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
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
Michael
3960e5aa32
Update client/mapView/MapView.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-08-27 20:55:37 +02:00
Dydzio
321c9c2ca6 Remove now unused enum 2023-08-27 20:18:19 +02:00
Dydzio
207a73b9de Fix mana drain not refreshing battle hero window mana 2023-08-27 18:58:07 +02:00
Dydzio
e1eb245565 Better default stack action handling + "F shortcut" mode fixes 2023-08-27 17:33:10 +02:00
Michael
f16b93c391
dead area for zoom 2023-08-27 14:00:40 +02:00
Michael
b77bccdc24
code review 2023-08-27 12:09:26 +02:00
Michael
d1d0d6d62e
fps independent 2023-08-27 02:35:10 +02:00
Michael
4137a66f2a
fix division by zero edge case 2023-08-27 00:53:09 +02:00
Ivan Savenko
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
Michael
bbd69fd430
added setting 2023-08-27 00:33:52 +02:00
Michael
4eecca2d9a
code review 2023-08-27 00:22:29 +02:00
Michael
6b71820197
avoid some edge cases 2023-08-26 23:25:46 +02:00
Michael
a354a7f696
compatible with older sdl 2023-08-26 22:30:02 +02:00
Michael
cde22b3755
fix 2023-08-26 21:37:29 +02:00