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

8302 Commits

Author SHA1 Message Date
Andrey Filipenkov
acfdbe87fe remove duplicate entry 2022-10-01 16:01:02 +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
ebeff94130 inherit CHeroWindow from CStatusbarWindow for proper status bar support 2022-10-01 11:21:16 +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
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
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
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
Andrey Filipenkov
836d7dc2d6 prohibit digging while waiting for your turn to start 2022-09-29 15:52:28 +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
Tomasz Zieliński
475f835769 More style tweaks 2022-09-28 11:38:08 +02:00
Andrii Danylchenko
4a7d290112
Merge pull request #1009 from kambala-decapitator/fix-elixir-of-life-regen
fix healing from Elixir of Life
2022-09-27 16:36:47 +03:00
Andrey Filipenkov
90eeb41618 fix healing from Elixir of Life 2022-09-27 14:03:36 +03:00
Andrey Filipenkov
e8396401f9 fetch Extra Resolutions mod path from the settings schema 2022-09-27 11:56:13 +03:00
Andrey Filipenkov
42ea458ccf handle (un)installing Extra Resolutions mod 2022-09-27 11:56:13 +03:00
Andrey Filipenkov
d06977ecbb handle enabling/disabling Extra Resolutions mod 2022-09-27 11:56:13 +03:00
Andrey Filipenkov
76b36b8951 iOS can use any resolution 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
063f80fac3 don't list resolutions larger than the selected screen's in the launcher 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
6e6bf1e77b don't list resolutions larger than the current screen's in the game options 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
9aad1ae95e handle integer type in vcmi <-> Qt JSON interoperability 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
36cbb2f605 make Display Index combobox empty by default 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
cfba8a5373 replace deprecated signal 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
f0b909f772 code improvement 2022-09-27 11:56:12 +03:00
Tomasz Zieliński
d38b6297f8 missing line 2022-09-27 07:53:21 +02:00
Tomasz Zieliński
f386f42166 Merge remote-tracking branch 'origin/develop' into terrain-rewrite
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
2022-09-27 07:50:17 +02:00
Andrey Filipenkov
1dc7ccb7d0 remove declaration of non-existent function 2022-09-27 07:06:17 +03:00
Andrey Filipenkov
53ac61b52b iOS: don't create unused CConsoleHandler 2022-09-27 07:05:10 +03:00
Andrey Filipenkov
70c51e4370 iOS: don't compile unused function 2022-09-27 07:01:16 +03:00
Agoston Szepessy
7a51527ede Change issues link to github issues link 2022-09-26 20:57:51 -07:00
Andrey Filipenkov
95e3400eb9 raise iOS deployment target to 12.0 2022-09-27 06:31:06 +03:00
Andrey Filipenkov
802147c5b7 add some asserts that shouldn't fire 2022-09-26 14:06:55 +03:00
Andrey Filipenkov
bbf08afb3d fix possible memory leak 2022-09-26 14:06:55 +03:00
Tomasz Zieliński
25f66097cc Handle RoadType by value / reference 2022-09-26 10:20:39 +02:00
Tomasz Zieliński
f804f8a326 Store RiverType by value, handle by reference 2022-09-26 09:51:36 +02:00
Tomasz Zieliński
11dd71515a comment 2022-09-26 09:18:01 +02:00
Tomasz Zieliński
2bd30556a3 Store TerrainType by havlue and handle by reference 2022-09-26 09:17:55 +02:00
Andrii Danylchenko
6ad468ecd3
Merge pull request #995 from Nordsoft91/hotfix/mods-deps
Hotfix for mods dependencies
2022-09-26 09:14:18 +03:00