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

15793 Commits

Author SHA1 Message Date
Ivan Savenko
73f4ad46ca Tweaked default settings for controller sensitivity 2024-04-30 21:29:49 +03:00
Ivan Savenko
89d6ddd916 Allow input configuration via config file 2024-04-30 20:56:47 +03:00
Ivan Savenko
dd9e002031 Add hotkey to track human player hero in MP. Fixed broken 'toggle grid'
hotkey
2024-04-30 19:10:10 +03:00
Ivan Savenko
74d3b4ab43 Added block for several more actions outside of our turn 2024-04-30 17:51:32 +03:00
Ivan Savenko
d53082e1c1 Block few more cases of access during another player turn in UI 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
Ivan Savenko
49691ef743 Unblock interface during turn of another human player 2024-04-30 17:51:31 +03:00
Ivan Savenko
ac11a0e639 Blocked most of incoming network packs during turns of other players 2024-04-30 17:51:31 +03:00
Ivan Savenko
3749439702
Merge pull request #3862 from IvanSavenko/fix_json
Fix issues with json config
2024-04-30 17:51:00 +03:00
Ivan Savenko
6c86d0ffe1
Merge pull request #3863 from vcmi/joystick_support
[1.5.0] Joystick support
2024-04-30 17:50:46 +03:00
Ivan Savenko
d1b9562682
Merge pull request #3845 from Laserlicht/patch-2
innoextract mobile optimization
2024-04-30 17:48:33 +03:00
Ivan Savenko
beece777d0 Fix config 2024-04-30 16:43:35 +03:00
Ivan Savenko
742149062a Apply SonarCloud suggestions 2024-04-30 16:40:23 +03:00
Ivan Savenko
2ba4458cea Remove no longer used enum 2024-04-30 15:37:30 +03:00
Ivan Savenko
2b9ad0fdfa Fix time handling 2024-04-30 15:31:35 +03:00
Ivan Savenko
f593321f4c Fix style 2024-04-30 15:23:19 +03:00
Ivan Savenko
1dc27046ef Unified game controller input with keyboard/mouse 2024-04-30 15:21:07 +03:00
Ivan Savenko
9a71614588 Simplify code 2024-04-30 12:01:03 +03:00
Ivan Savenko
0d8d75afd4 Spaces -> tabs 2024-04-30 11:38:13 +03:00
Ivan Savenko
62bb9fe4b7
Merge pull request #3762 from kdmcser/joystick_support
joystick support for VCMI
2024-04-30 11:28:16 +03:00
Ivan Savenko
9187beb7ee
Merge branch 'joystick_support' into joystick_support 2024-04-30 11:27:55 +03:00
Ivan Savenko
1dd8d164cb Fixed version of vcmi mod 2024-04-30 11:20:32 +03:00
Ivan Savenko
80bd420203 Remove duplicated element in json 2024-04-30 11:20:15 +03:00
Laserlicht
0565c062e5 Server functionality 2024-04-30 01:52:49 +02:00
Laserlicht
f4d1442a86 pvp option init 2024-04-29 23:55:02 +02:00
Laserlicht
5b21c10ba4
Update launcher/firstLaunch/firstlaunch_moc.cpp
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-04-29 22:05:04 +02:00
Laserlicht
81fa8a4efa reduce double code 2024-04-29 21:09:37 +02:00
Ivan Savenko
a5361abe16
Merge pull request #3860 from IvanSavenko/bugfixing
Fix freezes (multiplayer and game loading)
2024-04-29 19:44:11 +03:00
Ivan Savenko
26ffa3342b Fix locked UI on starting multiplayer game 2024-04-29 17:02:27 +03:00
Ivan Savenko
75ff1f7b60 Fix app freeze on attempt to exit game during loading 2024-04-29 17:02:02 +03:00
DjWarmonger
86bf4f98af
Merge pull request #3846 from vcmi/triple_resource_window
Handle triple resources in creature recruitment window
2024-04-29 12:23:10 +02:00
Ivan Savenko
8510478355
Merge pull request #3854 from IvanSavenko/fix_save_compat
Fix save compatibility with 1.4 that was broken by artifact costumes
2024-04-28 21:46:11 +03:00
Ivan Savenko
c5d7fd543a
Merge pull request #3852 from SoundSSGood/dismiss-hero-fix
Dismiss hero with picked artifact. Fixed.
2024-04-28 21:46:01 +03:00
Ivan Savenko
151075f088 Fix save compatibility with 1.4 that was broken by artifact costumes 2024-04-28 20:54:33 +03:00
kdmcser
f2404db553 replaces lobbyBeginGame with lobbyBeginStandardGame and lobbyBeginCampaign 2024-04-29 01:19:31 +08:00
kdmcser
92b1c8deb5 Merge branch 'develop' into joystick_support 2024-04-29 00:49:04 +08:00
Ivan Savenko
be54836401
Merge pull request #3849 from IvanSavenko/fix_vcai_crash
Fix possible crash on AI attempting to build building in town
2024-04-28 19:48:23 +03:00
kdmcser
836c891c36 support map scroll 2024-04-29 00:43:48 +08:00
Ivan Savenko
8fd2849b0b
Merge pull request #3847 from vcmi/fix-3842
#3842 - fix negative link cost because of bonuses
2024-04-28 19:35:27 +03:00
SoundSSGood
7543e26d42 dismiss hero with fix 2024-04-28 19:01:14 +03:00
Ivan Savenko
c74d728f5a
Merge pull request #3833 from SoundSSGood/artifacts-costumes
Artifacts costumes
2024-04-28 16:10:24 +03:00
SoundSSGood
0ac7108293
Update lib/CPlayerState.h
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-04-28 13:02:27 +02:00
Tomasz Zieliński
34d8afaa67 Even better alignment 2024-04-28 12:40:55 +02:00
Ivan Savenko
142bbe652a
Merge pull request #3829 from IvanSavenko/goldmaster
Tweaks for public release mode
2024-04-28 13:11:38 +03:00
Ivan Savenko
aac25f72b4
Merge pull request #3843 from IvanSavenko/fix_lobby_window_position
Fix positioning of lobby window after resolution or UI scaling change
2024-04-28 13:11:10 +03:00
Ivan Savenko
b0effdbbf4
Merge pull request #3836 from vcmi/unpropagate_bonus
Fixes issue of bonuses not correctly removed
2024-04-28 13:10:23 +03:00
Ivan Savenko
8fa615a8f7 Fix possible crash on AI attempting to build building in town 2024-04-28 12:53:10 +03:00
Tomasz Zieliński
4f7a8d83cc Tweak text alignment 2024-04-28 10:29:22 +02:00
Andrii Danylchenko
f1d7151a93 #3842 - fix negative link cost because of bonuses 2024-04-28 09:11:15 +03:00
Tomasz Zieliński
f28438902a Fit 3 resources in creature recruitmnet window 2024-04-28 07:54:19 +02:00