1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

8769 Commits

Author SHA1 Message Date
Andrey Filipenkov
8f51a8756b restore last used address in Multiplayer join dialog
in all other cases (when machine is host) hardcoded localhost address is displayed
2022-10-01 17:41:12 +03:00
Andrey Filipenkov
b26db479d7 don't add Necromancy to Witch Hut on random maps 2022-10-01 16:01:47 +03:00
Andrey Filipenkov
acfdbe87fe remove duplicate entry 2022-10-01 16:01:02 +03:00
Andrii Danylchenko
2434fe3f6f NK: fix AI speed 2022-10-01 13:49:27 +03:00
Andrii Danylchenko
1aefbd14a7
Merge pull request #1027 from kambala-decapitator/fix-quest-multiple-artifacts
Fix quest check that requires identical artifacts
2022-10-01 13:03:46 +03:00
Andrii Danylchenko
2e351aa815
Merge pull request #1030 from kambala-decapitator/hero-statusbar-after-spellbook
fix status bar behavior in CHeroWindow
2022-10-01 12:49:36 +03:00
Andrey Filipenkov
796845d173 [iOS] clear focus in launcher only when something has focus 2022-10-01 12:37:23 +03:00
Andrey Filipenkov
b766edb6af [iOS] don't nest AI and scripting libs under subdirectories
3rd party signing tools may ignore such directory layout
2022-10-01 12:36:48 +03:00
Andrey Filipenkov
ebeff94130 inherit CHeroWindow from CStatusbarWindow for proper status bar support 2022-10-01 11:21:16 +03:00
Andrey Filipenkov
c9ae43abe8 highlight current resolution in the resolution selector in game options 2022-10-01 10:33:48 +03:00
Andrey Filipenkov
aa217236b3 check amount of artifacts on hero when checking requirements of a quest that requires artifact(s)
fixes case when 2 or more identical artifacts are required
2022-10-01 09:28:32 +03:00
Andrey Filipenkov
86708841f8 code improvement 2022-10-01 09:24:58 +03:00
Andrii Danylchenko
99502c97d0
Merge pull request #1012 from kambala-decapitator/ios-launcher-prevent-autofocus
prevent keyboard appearing automatically after switching tab
2022-10-01 09:18:10 +03:00
Andrii Danylchenko
5b72284aba
Merge pull request #1023 from kambala-decapitator/unlock-advmap-after-battle-result
unlock adventure map UI after closing battle result dialog
2022-10-01 09:17:03 +03:00
Andrii Danylchenko
a2dbb6c8ac
Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions
Hide unsupported resolutions
2022-09-30 17:34:07 +03:00
nordsoft
3621b05682 Rename variable 2022-09-30 18:28:17 +04:00
Andrey Filipenkov
c4c2e03b6e fix typo 2022-09-30 15:06:56 +03:00
Andrey Filipenkov
4de0300c76 unlock adventure map UI after closing battle result dialog 2022-09-30 15:06:50 +03:00
Andrey Filipenkov
4e1b441399 [macOS] set app and bundle version in app bundle's Info.plist generated by CPack 2022-09-30 13:25:14 +03:00
Andrey Filipenkov
7801a2ad85 [iOS] show app and bundle version in system settings 2022-09-30 12:52:45 +03:00
Andrey Filipenkov
8e066a00bc [iOS] set bundle version to date-commit 2022-09-30 12:51:47 +03:00
Andrey Filipenkov
3f61e6f964 [iOS] allow setting custom app name 2022-09-30 12:33:37 +03:00
Andrey Filipenkov
4a1933bac3 display build version in the launcher 2022-09-30 12:33:37 +03:00
Andrey Filipenkov
a11135152c remove trivial manual implementation of assignment operator
fixes clang warning: Definition of implicit copy constructor for 'RiverType' is deprecated because it has a user-provided copy assignment operator
2022-09-30 11:26:36 +03:00
Andrii Danylchenko
35f2fb01ab
Merge pull request #1021 from Alexander-Wilms/patch-1
Update bug tracker URL in metainfo
2022-09-30 09:35:28 +03:00
Andrii Danylchenko
4835387004
Merge pull request #1015 from kambala-decapitator/prohibit-dig-while-waiting
prohibit digging while waiting for your turn to start
2022-09-30 08:39:48 +03:00
Andrii Danylchenko
2e2ea2fe88
Merge pull request #1020 from vcmi/fix-assert
Fixed asserts (only for debug build)
2022-09-30 08:32:39 +03:00
Alexander Wilms
48150211d9
Update bug tracker URL in metainfo 2022-09-29 23:07:54 +02:00
Tomasz Zieliński
127d7ec40b Fixed asserts (only for debug build) 2022-09-29 21:10:44 +02:00
nordsoft
8a8716ce8a Pass loaded game over network too 2022-09-29 21:33:44 +04:00
nordsoft
b888e640f3 Fix compilation 2022-09-29 21:18:30 +04:00
nordsoft
fea05a4320 Finally game restart works
# Conflicts:
#	lib/CGameState.cpp
#	server/CVCMIServer.cpp
2022-09-29 21:08:05 +04:00
Andrii Danylchenko
dae726b82d
Merge pull request #1005 from kambala-decapitator/ios-min-12
raise iOS deployment target to 12.0
2022-09-29 19:57:04 +03:00
Andrii Danylchenko
557512b308
Merge pull request #1006 from AgostonSzepessy/dev/agos/small-fixes
Small misc fixes
2022-09-29 19:53:27 +03:00
DjWarmonger
58a3abb643
Merge pull request #963 from vcmi/terrain-rewrite
Terrain rewrite
2022-09-29 18:24:05 +02:00
Andrii Danylchenko
878aabd4d6
Merge pull request #981 from kambala-decapitator/fix-analyzer-warnings
Fix Clang Analyzer warnings
2022-09-29 19:23:24 +03:00
nordsoft
9bf7106905 Add compatibility info 2022-09-29 18:21:29 +04:00
nordsoft
ae15807964 Collect mod info from remote mod.json 2022-09-29 17:38:03 +04:00
Andrey Filipenkov
836d7dc2d6 prohibit digging while waiting for your turn to start 2022-09-29 15:52:28 +03:00
nordsoft
cbfa125085 Remove commented line 2022-09-29 14:29:57 +04:00
Andrey Filipenkov
8c8394b6ed fix passing coordinates of the status bar when triggering in-game console input 2022-09-29 13:24:23 +03:00
Andrey Filipenkov
593df25df5 [iOS] use SDL's standard input handling for in-game chat 2022-09-29 13:23:15 +03:00
Andrey Filipenkov
e8a1709fc4 fix typo in file name 2022-09-29 12:47:31 +03:00
Tomasz Zieliński
20c102e648 Remove T prefix from new typedefs 2022-09-29 11:44:46 +02:00
Andrey Filipenkov
d1d274382c [iOS] prevent keyboard appearing automatically after switching tab in launcher 2022-09-29 12:17:37 +03:00
nordsoft
9fb5d0e726 Fix stackinstance deserialization 2022-09-29 00:35:51 +04:00
nordsoft
bebe0dd86c Some change 2022-09-29 00:35:38 +04:00
nordsoft
0eb589fb58 Load map by itself 2022-09-29 00:09:18 +04:00
nordsoft
2eb497b477 Looks like everything works 2022-09-28 23:38:41 +04:00
nordsoft
7ee4fca120 Pass whole gamestate over network 2022-09-28 23:15:05 +04:00