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

8257 Commits

Author SHA1 Message Date
Tomasz Zieliński
475f835769 More style tweaks 2022-09-28 11:38:08 +02: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
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
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
Andrii Danylchenko
4205701f96 #973 - use ship battleground for favorable winds 2022-09-24 17:43:37 +03:00
Andrii Danylchenko
f8e13d4c0d
Merge pull request #776 from kambala-decapitator/ios-PR
iOS platform support
2022-09-24 17:42:17 +03:00
Andrey Filipenkov
9f46bf5bff Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-09-24 15:55:26 +03:00
Andrey Filipenkov
5f0a8419d3 install scripts directory only when scripting modules are enabled 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
b8eef4ce35 support building against iOS SDK < 13.0 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
d2ded404bb use system background color for the keyboard textfield
fix kambala-decapitator/vcmi#45
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
7b4412758c [CI] download dependencies from VCMI repo 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
605d5b6481 add dedicated macro when building as single process
fix kambala-decapitator/vcmi#40
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
f56acf8a80 fix crash on exiting Custom Campaign
fix kambala-decapitator/vcmi#46
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
2a50fb487f [CI] produce full iOS build log 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
011f303397 code style improvement 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
a5f9efb3df workaround GCC < 7.0 bug
template specialization from namespace must be enclosed in the namespace
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
44174da9a2 fix MXE build 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
beaa1dd17c add instructions for iOS 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
ef2e45a977 stop text input on connection start 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
3ab21d8491 show loading indicator when starting local server
single player or hosting a multiplayer game
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
2af7c29163 enable Foundation assertions only in Debug build 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
031ba967d3 fix indentation 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
e1c9903a45 extract iOS helpers into a shared lib 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
ec6c72807b update AUTHORS 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
84111d99ca add VCMI logo to splash screen
fix kambala-decapitator/vcmi#42
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
a851e630d5 fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
7b411a5fc4 fix building vcmiERM for iOS 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
cd88f3fa9e add vcmiLua headers to CMake 2022-09-24 15:55:24 +03:00
Andrey Filipenkov
f115a49926 update app icon
fix kambala-decapitator/vcmi#41
2022-09-24 15:55:24 +03:00