games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
20,847 Commits 30 Branches 75 Tags
66e6b8d39452b3da5f04d8c3c03653b81b9ffbff
Commit Graph
362 Commits
Author SHA1 Message Date
Andrey Filipenkov e412ebb487 remove bundled minizip 2025-08-28 16:05:12 +03:00
Andrey Filipenkov a3f08c2217 [conan] add MSVC support 
also removes all mentions of vcpkg and cross-building from Linux
 2025-08-28 16:05:11 +03:00
Andrey Filipenkov 951be24f5e [cmake][android] improve fetching ANDROID_SYSROOT_LIB_SUBDIR 
now it uses info from file bundled in the NDK
 2025-08-28 16:05:11 +03:00
Andrey Filipenkov 5028af75cf [conan] migrate to v2 2025-08-28 16:05:10 +03:00
George King 2bd18ec430 Remove Czech comment leftover 2025-08-23 20:24:55 +02:00
George King 2eaba9fafb Add files via upload 2025-08-23 19:12:55 +02:00
Laserlicht 62dc6bc6a3 Fix build with Boost 1.89.0 2025-08-17 16:30:57 +02:00
Ivan Savenko ef3e67ec6e Merge pull request #6001 from vcmi/master 
Merge master -> develop
 2025-08-10 17:12:44 +03:00
Ivan Savenko f9a44be214 Generate .zip installer archive via CPack on Windows 2025-08-03 15:39:10 +03:00
George King 61c6ee7a0c Update CMakeLists.txt 2025-07-19 18:01:12 +02:00
George King 025f592f39 Removed psapi as it's needed only for ARM64 by Boost in CConsoleHandler 2025-07-17 14:55:03 +02:00
George King 045dd3de11 Inno Setup + AMR64 preparation 2025-07-15 19:21:12 +02:00
Andrey Filipenkov 34e56c362f update Gradle to 8.13 and AGP to 8.11 
also updates:
- targetSdkVersion to 35
- buildToolsVersion to 35.0.0

# Conflicts:
#	android/vcmi-app/build.gradle
 2025-07-09 11:13:04 +03:00
Laserlicht ddd422a075 template editor 2025-06-08 15:20:49 +02:00
Ivan Savenko 64ac14fa06 Remove boost::thread from cmakelists 2025-03-02 14:33:11 +00:00
Laserlicht 70891b0304 portmaster support 2025-02-16 22:29:07 +01:00
Ivan Savenko 8d78bb1a82 Merge pull request #5337 from IvanSavenko/ffmpeg_explicit 
[1.6?] Explicit toggle for ffmpeg video player compilation
 2025-01-29 12:01:35 +02:00
Ivan Savenko bc524c60d7 Explicit toggle for ffmpeg video player compilation 2025-01-27 15:38:50 +00:00
Andrey Filipenkov 4e4684cedf [cmake] set some policies 2025-01-08 15:22:21 +03:00
Andrey Filipenkov 6323e7b4da [macOS] run hdiutil under sudo only on CI 2025-01-08 15:22:21 +03:00
Joakim Thorén c3f675c3ea Remove '-Og' from MINGW debug builds. It interferes with debugging. See https://stackoverflow.com/a/63386263/2323908. Instead, the default O0 is used. 
This change makes it possible to use whatever optimization levels you want debug builds, which was previously impossible due to the passing of -Og in CMakeLists.txt.
 2024-11-16 17:15:55 +01:00
Ivan Savenko 34447fd844 Fix missing standard libraries from package on mingw 2024-10-14 13:05:10 +00:00
Ivan Savenko 501622229d Use new prebuilts package 2024-10-14 13:05:10 +00:00
Ivan Savenko 1687606a4b Merge pull request #4726 from wb180/vcmiqt_lib 
Separate vcmiqt static lib
 2024-10-07 17:37:51 +03:00
Evgeniy Meshcheryakov 40576e9bb9 Separate vcmiqt lib 2024-10-07 08:47:00 +03:00
Ivan Savenko e497a51373 Use swresample (part of FFmpeg) to de-planarize audio into format that 
can be consumed by SDL
 2024-10-01 15:38:15 +00:00
SoundSSGood 7eda885390 client icons path fixed 2024-09-14 16:03:26 +03:00
Ivan Savenko ee64928454 Merge pull request #4448 from smanolloff/split-client+develop 
Split vcmiclient in two
 2024-09-02 15:34:05 +03:00
Romain TISSERAND c11ec8a3cf Fix debug non-amd64/x86_64 builds with CMake 2024-08-26 20:55:23 +02:00
Simeon Manolov d05adfc5d5 Merge branch 'develop' into split-client+develop 2024-08-21 17:40:37 +03:00
Ivan Savenko f0448acaa3 TBB is now a dependency of lib. Implemented multithreaded xBRZ scale 2024-08-17 15:25:26 +00:00
Simeon Manolov f2cddaa21b Split vcmiclient in two 
Similar to vcmiserver (app) and vcmiservercommon (lib), now
there is vcmiclient (app) and vcmiclientcommon (lib).
 2024-08-14 19:20:01 +03:00
Ivan Savenko 6b8f94e6e7 Merge remote-tracking branch 'vcmi/master' into develop 2024-07-11 17:43:44 +00:00
Ivan Savenko ae689625e4 Merge pull request #4219 from smanolloff/add-tbb-dependency 
Add TBB in conanfile and CMakeLists
 2024-07-08 19:34:08 +03:00
Simeon Manolov 601840eb5f address code review comments 2024-07-08 00:02:01 +03:00
Ivan Savenko b2b3dafe10 Bump Android target SDK to Android 14 (34) 2024-07-04 14:44:25 +00:00
Alexander Wilms 02e429e973 Fix typos using https://github.com/crate-ci/typos 
Changes were reviewed manually
 2024-06-24 03:47:19 +02:00
Andrey Filipenkov 8cee8b72a6 [launcher] build for Android 
also embeds icons and translations as Qt resources instead of reading from disk
 2024-06-08 00:09:04 +03:00
Ivan Savenko ecb8d17ca8 Remove flag that requires optimized builds 2024-05-13 12:23:46 +00:00
Ivan Savenko b207768cf3 Use STREQUAL instead of MATCHES where applicable 2024-05-12 17:06:46 +00:00
Ivan Savenko 55d7e31f7e Use hardening flags only for debug builds to avoid conflicts 2024-05-12 15:10:01 +00:00
Ivan Savenko b3499c54ae Added "ENABLE_GOLDMASTER" switch 
Intended for functionality that should be disabled or enabled in public
releases.
Largely replaces existing ENABLE_GITVERSION switch, which is now always
disabled if GOLDMASTER is in use
 2024-04-25 18:52:25 +03:00
Ivan Savenko 6901825b62 Merge pull request #3707 from Laserlicht/innoextract 
include innoextract
 2024-04-19 20:06:41 +03:00
Laserlicht 44a31910e3 inverse flag; simplify 2024-04-16 22:23:41 +02:00
Laserlicht de9dbf0cd7 introduce innoextract 2024-04-13 17:19:47 +02:00
Ivan Savenko c1cb6eb67f Use additional checks only for non-Windows gcc builds 2024-04-11 13:37:46 +03:00
Ivan Savenko c7fda0dc32 Add more debug checks for gcc 2024-04-11 13:25:48 +03:00
Ivan Savenko 39da7b3e32 Added option to build minimal vcmi library as needed by lobby 2024-03-28 12:07:49 +02:00
Ivan Savenko 9cf161bc66 Do not search for client-specific packages if client is not being built 2024-03-28 12:07:49 +02:00
Ivan Savenko 129aebab2a Client compilation is now optional 2024-03-28 12:07:49 +02:00