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

15470 Commits

Author SHA1 Message Date
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
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
Ivan Savenko
5010344df0 Added serialization of turn timer handler 2024-04-26 13:16:02 +03:00
Ivan Savenko
090a1c7764 TurnTimerHandler is now a unique_ptr 2024-04-26 13:15:39 +03:00
Ivan Savenko
a99d5e6fa1 Simplify code 2024-04-26 12:44:57 +03:00
Ivan Savenko
75aae66858 Fix off-by-one error - turnLimit 1 should work after 1st turn, not 2nd 2024-04-26 12:44:42 +03:00
Ivan Savenko
12374da7f8 Updated changelog to add new changes from April 2024-04-26 12:05:09 +03:00
Ivan Savenko
c524648c7b
Merge pull request #3825 from kdmcser/chinese_translate
update chinese translation
2024-04-26 11:59:01 +03:00
Ivan Savenko
16b8b0807d
Merge pull request #3798 from altiereslima/develop
Update Portuguese Translation
2024-04-26 11:58:52 +03:00
Ivan Savenko
01c2814d35
Merge pull request #3821 from SoundSSGood/CWindowWithArtifacts-refactoring
CWindowWithArtifacts refactoring
2024-04-26 11:58:38 +03:00
Ivan Savenko
6413747fff
Merge pull request #3828 from IvanSavenko/fix_rewardable
Fix crash on visiting misconfigured rewardable object
2024-04-26 11:58:27 +03:00
Ivan Savenko
1dc962804e Fixed possible crash on having selectable reward with no visual image 2024-04-25 14:04:45 +03:00
Ivan Savenko
428c88d8c1
Merge pull request #3776 from IvanSavenko/lobby_room_compatibility_check
Check for game version and mods compatibility in lobby
2024-04-25 11:46:40 +03:00
altiereslima
ad519ea296 Update portuguese.json 2024-04-24 23:07:57 -03:00
altiereslima
749f6520b0 Update portuguese.json 2024-04-24 23:00:44 -03:00
Ivan Savenko
b2b085fb94
Merge pull request #3826 from IvanSavenko/fix_random_monsters
Fix thrown exception on random monster initialization
2024-04-24 23:13:41 +03:00
Ivan Savenko
7f732b6d0a Fix thrown exception on random monster initialization 2024-04-24 22:57:13 +03:00
kdmcser
94aa9482e7 update chinese translation 2024-04-24 22:26:22 +08:00
SoundSSGood
c9a8f8e855 Sonarcloud warnings 2024-04-23 22:21:46 +03:00
Ivan Savenko
30a3081ab4 Use account name from lobby when joining lobby game rooms 2024-04-23 19:22:31 +03:00
Ivan Savenko
de4ab94ef3 Update translation 2024-04-23 19:22:07 +03:00
Ivan Savenko
f40acfc120 Fixed display of mod version for excessive mods 2024-04-23 19:21:57 +03:00
Ivan Savenko
67cf37b85b Fixed check for number of players in the room 2024-04-23 19:21:30 +03:00
SoundSSGood
20471c9c2f virtual CWindowObject 2024-04-23 18:58:41 +03:00
Andrii Danylchenko
b4abb3a56c
Merge pull request #3814 from vcmi/fixes
NKAI: fix patrolling heroes never retreat and town danger evaluation
2024-04-23 18:52:47 +03:00
Ivan Savenko
e05a05c455 Updated translations 2024-04-23 17:15:59 +03:00
Ivan Savenko
f88ff57810 Adjusted main lobby widget to account for removed 'join room' button 2024-04-23 17:15:59 +03:00
Ivan Savenko
8ec989bbdc Removed no longer used icon 2024-04-23 17:15:59 +03:00
Ivan Savenko
662a508944 Better UI design for room preview dialog 2024-04-23 17:15:59 +03:00
Ivan Savenko
3e23a55c66 Fix build 2024-04-23 17:15:59 +03:00
Ivan Savenko
526ac9807b Enabled 'keepalive' option to detect dead connections 2024-04-23 17:15:59 +03:00
Ivan Savenko
ff1aa4407c Fixed database version upgrade 2024-04-23 17:15:59 +03:00
Ivan Savenko
1840666327 Implemented join room dialog 2024-04-23 17:15:59 +03:00
Ivan Savenko
e5f8cefa7f Store and send mod list and game version for game rooms 2024-04-23 17:15:59 +03:00
Ivan Savenko
6ba6e0d55b Moved serialization of ModCompatibilityInfo from MapFormat 2024-04-23 17:15:59 +03:00
SoundSSGood
25d2b468c3 CWindowWithArtifacts preparations 2024-04-23 16:06:58 +03:00
Ivan Savenko
62d15ed23c
Merge pull request #3820 from IvanSavenko/bugfixing
Bugfixing
2024-04-23 13:03:36 +03:00
Ivan Savenko
ba3137582b
Merge pull request #3797 from Laserlicht/install_from_file
Install from file button in launcher
2024-04-23 12:06:54 +03:00