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

15717 Commits

Author SHA1 Message Date
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
Laserlicht
10d299c74b
missing character 2024-04-27 23:39:10 +02:00
Laserlicht
3952b661a0
avoid to select incorrect files on mobile platforms 2024-04-27 23:35:57 +02:00
Laserlicht
c148f929ae
optimisations for mobile 2024-04-27 23:05:17 +02:00
Laserlicht
e52dbf028c
seperate button update from extraction process 2024-04-27 22:54:32 +02:00
SoundSSGood
ce68b3f45d class CArtifactsOfHeroMain : public CKeyShortcut 2024-04-27 21:35:38 +03:00
SoundSSGood
ce9d2d8ab8 Switching costume 2024-04-27 21:35:37 +03:00
SoundSSGood
25dea7e364 Saving costume 2024-04-27 21:35:37 +03:00
Ivan Savenko
24a233f8ad Fix positioning of lobby window after resolution or UI scaling change 2024-04-27 21:32:16 +03:00
Laserlicht
ab50bf9198
biography to description 2024-04-27 18:41:21 +02:00
kdmcser
1eea8398b4 make joystick configurable 2024-04-27 22:42:54 +08:00
Ivan Savenko
90fa1718a5
Merge pull request #3841 from vcmi/fix-3754
Fix #3754, #2316
2024-04-27 16:33:38 +03:00
Andrii Danylchenko
39e19f79f4 Fix #3754, #2316 2024-04-27 13:57:50 +03:00
Andrii Danylchenko
2ead852f09
Merge pull request #3839 from vcmi/fix-clusters-unlock
#3824 - fix cluster unlock
2024-04-27 13:54:20 +03:00
Andrii Danylchenko
afa766c763 #3824 - fix cluster unlock 2024-04-27 10:57:30 +03:00
Andrii Danylchenko
a0375d4e89
Merge pull request #3837 from vcmi/commander-issues
Commander issues
2024-04-27 10:10:45 +03:00
Andrii Danylchenko
6e641dbdea #3824 - fix empty army with only commander issues 2024-04-26 23:18:20 +03:00
Ivan Savenko
844686f714
Merge pull request #3834 from IvanSavenko/mp_fixes
Fixes for multiplayer games
2024-04-26 22:10:12 +03:00
Tomasz Zieliński
914cea5877 Tweaks 2024-04-26 19:33:26 +02:00
Tomasz Zieliński
04691c851f Fixes issue of bonuses not correctly removed 2024-04-26 19:22:20 +02:00
Ivan Savenko
0fc17da164
Merge pull request #3835 from IvanSavenko/ccache_beta_fix
Fix CI on beta and master branches
2024-04-26 20:16:46 +03:00
Ivan Savenko
225eb88526 Fix CI on beta and master branches 2024-04-26 19:55:14 +03:00
Ivan Savenko
3fda399bde
Merge pull request #3822 from IvanSavenko/changelog_april
Updated changelog before beta
2024-04-26 18:08:02 +03:00
Ivan Savenko
0c24c93c8c SonarCloud fixes 2024-04-26 17:57:16 +03:00
Ivan Savenko
eaae78da7a Do not reset map settings unless player switches between scenario and
random map
2024-04-26 16:51:40 +03:00
Ivan Savenko
b54eede01c Always show dialog when player starts turn in multiplayer 2024-04-26 15:59:44 +03:00
Ivan Savenko
b8b42978b1 Reduce includes in headers 2024-04-26 13:26:33 +03:00