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

8285 Commits

Author SHA1 Message Date
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
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
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
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
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