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
380100f90b
compile Version.cpp only when ENABLE_GITVERSION is ON
...
Co-authored-by: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
2022-09-26 23:04:05 +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
Tomasz Zieliński
cd3a1a02c2
More style tweaks
2022-09-25 21:47:44 +02:00
Tomasz Zieliński
64fd896978
Free memory at TerrainTypeHandler destruction
2022-09-25 20:52:51 +02:00
Andrii Danylchenko
27dbee6069
Merge pull request #975 from Nordsoft91/incomatibility-response
...
Incompatibility response
2022-09-25 18:26:02 +03:00
Andrii Danylchenko
d6c2d05376
Merge pull request #992 from kambala-decapitator/msvc-ai-dlls
...
[MSVC] place AI dependencies into the right location at build time
2022-09-25 17:53:16 +03:00
Andrii Danylchenko
e11a5dbffc
Merge pull request #998 from Nordsoft91/fix-994
...
[994] fixed
2022-09-25 17:45:27 +03:00
Andrii Danylchenko
127a7e6653
Merge pull request #959 from kambala-decapitator/fix-cursor-attack
...
fix cursor image on hover when there're multiple creatures nearby
2022-09-25 17:44:10 +03:00
nordsoft
5552fbb8e6
Fix ios build
2022-09-25 16:24:25 +04:00
nordsoft
54e0bb17fd
[994] fixed
2022-09-25 16:17:21 +04:00
nordsoft
af98ce2e3d
Hotfix for mods dependencies
2022-09-25 15:36:46 +04:00
Andrey Filipenkov
a5b62104d4
remove solved TODOs
2022-09-25 14:11:11 +03:00
Andrey Filipenkov
3286eb613d
[msvc] move AI dll dependencies to the main bin dir after build
2022-09-25 14:09:09 +03:00
Andrey Filipenkov
96c2db4d56
remove useless variable
2022-09-25 13:13:37 +03:00
Andrii Danylchenko
742030bbc0
fix checking if a tile is guarded
2022-09-25 13:13:37 +03:00
Nordsoft91
d4f97aadf0
Merge branch 'develop' into incomatibility-response
2022-09-25 13:26:07 +04:00
Tomasz Zieliński
4ea57ea7fc
A variety of suggested style tweaks
2022-09-25 09:33:56 +02:00
Andrey Filipenkov
72feb538ce
add explicit null pointer checks
2022-09-25 10:05:16 +03:00
Agoston Szepessy
0718acdb6d
Use tuple instead of vector for comparing values
...
There are only 3 values, and they're only used for doing a comparison,
so it's wasteful to create a whole vector for that. std::tuple is better
suited for this use case.
2022-09-24 23:50:31 -07:00
Tomasz Zieliński
fd63cb6109
and here
2022-09-25 08:07:22 +02:00
Tomasz Zieliński
97a94ce61e
Handle Tile by reference instead of pointer
2022-09-25 08:04:15 +02:00
nordsoft
b6c0fcabbd
Try another way to disable editor for ios
2022-09-25 01:23:40 +04:00
nordsoft
dbe041016e
Try quotes
2022-09-25 01:14:14 +04:00
nordsoft
9e7a328cc4
Disable map editor for iOS
2022-09-25 01:10:18 +04:00
