games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-15 13:33:36 +02:00
Code Issues Releases Activity
9,561 Commits 21 Branches 67 Tags
Commit Graph

258 Commits

Author SHA1 Message Date
nordsoft
f6ae0c74ce Merge remote-tracking branch 'upstream/develop' into enet 
# Conflicts:
#	CI/mac/before_install.sh
 2023-01-18 02:16:15 +04:00
Ivan Savenko
e78d6f9d70 Fix MXE detection check 2023-01-16 21:28:32 +02:00
Ivan Savenko
c252837b6a Fix installation of compiled QM files 2023-01-16 18:02:11 +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
nordsoft
52e0736bd0 Fix compiling 2023-01-15 02:37:28 +04:00
nordsoft
2b4ae8cdd6 Try to compile 2023-01-15 02:08:50 +04:00
Ivan Savenko
192e856797 merge with vcmi/develop 2023-01-11 16:47:53 +02:00
nordsoft
03c3fa9e1a Merge remote-tracking branch 'upstream/develop' into enet 
# Conflicts:
#	client/CServerHandler.cpp
#	lib/serializer/Connection.cpp
#	lib/serializer/Connection.h
#	server/CVCMIServer.cpp
 2023-01-10 04:54:14 +04:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor 
Translate mapeditor
 2023-01-09 21:25:09 +02:00
Ivan Savenko
6379c5f6fa Install additional dll on Windows to get better style for Qt 2023-01-09 18:35:14 +02:00
Ivan Savenko
b1427f695b Fix MXE 2023-01-07 18:01:39 +02:00
Ivan Savenko
a55ac6c1e2 Fix MXE build 2023-01-07 16:51:23 +02:00
Ivan Savenko
7a8d85e023 Fix formatting 2023-01-07 16:51:03 +02:00
Ivan Savenko
d52b37fecb Moved strict compilation to CI-only 2023-01-05 17:37:40 +02:00
Ivan Savenko
c6290c1a50 Enable strict compilation by default 2023-01-05 17:37:40 +02:00
nordsoft
445f6c8598 Compile enet 2023-01-03 03:52:44 +04:00
Ivan Savenko
7b2ac670f2 Changed woring according to review 2022-12-28 22:42:34 +02:00
Ivan Savenko
0e67507434 Fix editor button visibility 2022-12-28 22:20:04 +02:00
Ivan Savenko
858fb97f42 Added -DENABLED_LAUNCHER and -DENABLED_EDITOR defines 2022-12-28 17:56:22 +02:00
Ivan Savenko
bbb1d36bce Fix formatting 2022-12-27 12:28:05 +02:00
Ivan Savenko
dd172b0ea6 Fixed formatting 2022-12-27 12:26:57 +02:00
Ivan Savenko
abc7c890bf Backported required changes from Launcher branch 2022-12-26 23:26:19 +02:00
Ivan Savenko
9fb426edc1 Do not use translator without translator tools 2022-12-25 23:42:06 +02:00
Ivan Savenko
82f1370111 Linguist tools are now optional 2022-12-25 23:23:44 +02:00
Ivan Savenko
e4e5278f60 Merge with vcmi/develop 2022-12-25 23:10:52 +02:00
Ivan Savenko
20dec34484 Attempt to make translations optional (MXE...) 2022-12-25 23:09:15 +02:00
Ivan Savenko
b012cd9490 Compiled launcher translations are now in launcher/translations/ dir 2022-12-25 22:18:14 +02:00
Ivan Savenko
eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
Ivan Savenko
f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
Ivan Savenko
b2279484fc
Merge pull request #1227 from Shatur/opendingux 
Port to OpenDingux handhelds
 2022-12-22 16:56:55 +02:00
nordsoft
4c15531a05 Fix cmake for macOS build 2022-12-21 23:08:53 +04:00
Hennadii Chernyshchyk
3f02146f87
Use different add_definitions for ENABLE_MONOLITHIC_INSTALL 2022-12-16 11:39:32 +02:00
Andrii Danylchenko
8c07ddbae0
Merge pull request #1204 from IvanSavenko/single_process_app_upgrade 
[1.2] Single process app support for platforms other than ios
 2022-12-15 12:22:24 +02:00
Hennadii Chernyshchyk
d7fbd4aa66
Call install_vcpkg_imported_tgt after initializing BIN_DIR 
Call it inside AI/CMakeLists.txt as it was before.
 2022-12-15 12:16:28 +02:00
Hennadii Chernyshchyk
3322ad9501
Move find_package for TBB on top for consistency with other 2022-12-15 02:21:44 +02:00
Hennadii Chernyshchyk
37068a75b3
Make ENABLE_NULLKILLER_AI top level option 2022-12-15 02:18:17 +02:00
Hennadii Chernyshchyk
79a9a0b85a
Fix paths for ENABLE_MONOLITHIC_INSTALL 2022-12-14 19:38:34 +02:00
Hennadii Chernyshchyk
1ccbc209a4
Add an option to disable Nullkiller AI 2022-12-13 22:16:48 +02:00
Hennadii Chernyshchyk
de33eb44f9
Port to OpenDingux handhelds 2022-12-13 03:55:54 +02:00
Ivan Savenko
f97d4c3630 Removed commented-out code 2022-12-12 18:50:14 +02:00
Ivan Savenko
0f2d4f119b Reverted -Werror due to new warnings in beta branch 2022-12-09 14:43:48 +02:00
Ivan Savenko
3e691d9033 Enable strict compilation by default in order for CI to use it 2022-12-09 14:17:03 +02:00
Ivan Savenko
db2a40600d Fixed some of the warnings detected by CI run 2022-12-08 23:20:42 +02:00
Ivan Savenko
31ac1e4ab2 Add path to libvcmi.so into RPATH so dynamic linker can find it 2022-12-08 12:46:40 +02:00
Ivan Savenko
4d494b0941 added ENABLE_STRICT_COMPILATION CMake option that sets -werror flag 2022-12-07 23:35:57 +02:00
Ivan Savenko
2855606a88 Enabled & fixed -Woverloaded-virtual warning from gcc/cland 
- fixed almost all instances of overloaded-virtual warning
- cleared up inheritance & method overrides in code affected by warning
 2022-12-07 21:50:45 +02:00
Ivan Savenko
111ac36417 Cleared up warning settings, enabled -werror for gcc/clang 2022-12-07 18:08:13 +02:00
Ivan Savenko
f8c67829a1 Restored single-app build to off by default 2022-12-06 22:30:34 +02:00