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

71 Commits

Author SHA1 Message Date
Andrey Filipenkov
0621dce157 [Conan] add Android support 2023-03-02 12:09:47 +03:00
Ivan Savenko
a9669578fc Remove MXE action from CI 2023-01-31 18:13:51 +02:00
Ivan Savenko
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
Konstantin
38ebb62c3e conan: build for 64-bit windows by default
This was strongly suggested by VCMI developers.
2023-01-27 00:11:17 +03:00
Konstantin
bd0c7c2b54 vcmi: add before_install.sh
For now, it uses pregenerated deps from my repository, but
should be transitioned to vcmi one after PR is finished
2023-01-26 23:50:08 +03:00
Konstantin
a24ec53df2 vcmi: enable Conan builds for cross-compiling Win
This patch enables usage of Conan for cross-compiling Windows
builds instead of MXE.
2023-01-26 23:49:00 +03:00
Andrey Filipenkov
9addc83a6b generate ipa file with CPack directly 2023-01-24 20:10:57 +03:00
Ivan Savenko
6321106b04
Reverted MXE to stable version 2023-01-17 23:15:06 +02:00
Ivan Savenko
96141f010b Merge remote-tracking branch 'vcmi/develop' into translate_launcher 2023-01-15 23:55:49 +02:00
Ivan Savenko
0a858d9a7c
Upgrade msvc to include enet and qt translator (#1436)
- Updated MSVC prebuilt package
- Fixed build warnings
2023-01-15 23:55:24 +02:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Andrey Filipenkov
b22c651b0f [CI] switch Apple platforms to Xcode 14 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
0eef2412db [Conan] switch to apple-clang 14 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
427cae2704 [Conan] fix building Boost.Locale with Apple-clang in versions >= 1.81 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
43ef6c075e [Conan] disable bitcode explicitly 2023-01-15 17:28:09 +02:00
Andrey Filipenkov
e855a9db7c [Conan] use profile includes for common parts 2023-01-15 17:28:09 +02:00
Ivan Savenko
9b77215b23 Attempt to fix slowdown in daily buid - revert MXE 2023-01-10 21:19:32 +02:00
Ivan Savenko
b1427f695b Fix MXE 2023-01-07 18:01:39 +02:00
Ivan Savenko
7a8d85e023 Fix formatting 2023-01-07 16:51:03 +02:00
Ivan Savenko
abc7c890bf Backported required changes from Launcher branch 2022-12-26 23:26:19 +02:00
Ivan Savenko
e9c08612ad Added MXE update instructions 2022-12-26 13:57:55 +02:00
Ivan Savenko
1963f3c7f1 MXE update test 2022-12-26 13:12:22 +02:00
Ivan Savenko
e5cb322eb0 Add qt5 translation tools into Linux CI 2022-12-26 00:16:16 +02:00
nordsoft
25803b3c3a Disable patch version for releases 2022-12-23 13:26:26 +04:00
Andrey Filipenkov
494e2c2c92 [CI] use specific GitHub release for macOS dependencies 2022-10-18 20:50:38 +03:00
Andrey Filipenkov
524ad5ab76 [CI] build iOS with Conan 2022-10-18 20:50:38 +03:00
Andrey Filipenkov
f10e5e3b99 [Conan] add iOS support 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
8bf33790b8 [Conan] use Ninja by default 2022-10-13 13:24:25 +03:00
Andrey Filipenkov
7b4412758c [CI] download dependencies from VCMI repo 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
d3e33b096f prepare CI for iOS 2022-09-24 15:55:23 +03:00
Andrii Danylchenko
735c4f149a Update vcpkg, fix QT paths 2022-09-24 10:53:09 +03:00
Andrey Filipenkov
d7650ce9c0
use Conan to make macOS CI builds for both Intel and ARM (#782)
* [CI] append platform to output artifact name if it's given
2022-08-30 17:29:00 +03:00
Max Desiatov
b8b330668d Remove ffmpeg@4 from $CMAKE_PREFIX_PATH as unused 2022-06-27 10:49:10 +03:00
Max Desiatov
aaa2cd6f04 Support Homebrew on M1
Homebrew uses prefix path on M1 (`/opt/homebrew`) different from x86_64 Homebrew path. It can be queried with `brew --prefix` command, which allows supporting both platforms in `mac/before_install.sh`.
2022-06-27 10:49:10 +03:00
Konstantin
8fc14369a4
CMake presets. (#744)
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
2022-05-26 08:55:20 +03:00
Konstantin
45bdacb119 mac: use stable ffmpeg for CI 2022-05-14 13:22:41 +03:00
Andrii Danylchenko
d17f1980d4 Fix build 2022-05-08 17:09:17 +03:00
Andrii Danylchenko
8b11b42aaf Fix RMG to place special dwellings like elemental conflux 2022-04-09 10:57:24 +03:00
Andrii Danylchenko
73906d5a97 fix mxe build 2022-03-21 10:03:03 +02:00
Andrii Danylchenko
9d7055c737 fix build of mxe 2022-03-21 09:56:49 +02:00
Andrii Danylchenko
569db9ed5d fix mac build 2022-03-05 19:31:47 +02:00
Andrii Danylchenko
2f450f6592 Fix MXE lib address and new compilation issues 2021-09-06 21:27:17 +03:00
Andrii Danylchenko
27b3a88dda Replace App Veyor 2021-08-21 09:32:52 +03:00
Andrii Danylchenko
3fa7e0976f Nullkiller: update / fix build, core changes required for Nullkiller AI 2021-07-26 21:02:50 +03:00
Andrii Danylchenko
b4241670ba Nullkiller: rename VCAI to AIGateway 2021-07-26 21:02:50 +03:00
Andrii Danylchenko
840a2d854d Fix build for luajit 2021-07-16 23:51:32 +03:00
Andrii Danylchenko
9c8d776398 Merge branch 'develop' into handlersAbstraction
# Conflicts:
#	CI/linux/before_install.sh
#	CI/mac/before_install.sh
#	CI/mxe/before_install.sh
#	lib/CModHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/CommonConstructors.cpp
#	server/CGameHandler.cpp
#	test/CMakeLists.txt
#	test/spells/effects/TeleportTest.cpp
2021-07-16 00:32:13 +03:00
Andrii Danylchenko
92a9106e89 Disable publishing builds to download.vcmi.eu except develop. Added artifacts 2021-07-13 14:56:35 +01:00
Andrii Danylchenko
6d8373a473 Configure github actions 2021-07-13 14:56:35 +01:00
AlexVinS
ecaa9f5d0b Entities redesign and a few ERM features
* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
2021-02-14 19:05:43 +03:00