games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Code Issues Releases Activity
8,932 Commits 19 Branches 61 Tags 108 MiB
cd58e8a860
Commit Graph

8932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Danylchenko
11790c7c02
Merge pull request #1083 from vcmi/fix-android 
Move version definition into a separate cmake file
 2022-10-23 10:39:25 +03:00
Andrii Danylchenko
3a9493130c
Merge pull request #1081 from kambala-decapitator/macos-bundle-ID 
[macOS] improve Info.plist
 2022-10-23 10:39:05 +03:00
nordsoft
75613a947d Implement command parsing 2022-10-23 02:55:22 +04:00
Andrey Filipenkov
7dcd910877 add Linux icons for the map editor 
Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>
 2022-10-22 23:03:01 +03:00
Andrii Danylchenko
6ef480971d Move version definition into a separate cmake file 2022-10-22 20:48:38 +03:00
Andrey Filipenkov
278e6bedeb [Linux] add proper desktop entry for the map editor 2022-10-22 17:08:55 +03:00
Andrey Filipenkov
e0e075df77 [Conan] save install folder to CMake variable 2022-10-22 16:59:45 +03:00
Andrey Filipenkov
d1ab611b4f [macOS] don't use macdeployqt together with Conan 2022-10-22 16:59:45 +03:00
Andrey Filipenkov
35a6a24204 [macOS] sign executables with bundle identifier 2022-10-22 16:59:45 +03:00
Andrey Filipenkov
8e8323a3d5 [macOS] build properly ordered list of executables that needs to be signed 2022-10-22 16:59:45 +03:00
Andrey Filipenkov
9865578faa [macOS] remove deprecated entries from Info.plist 2022-10-22 16:53:08 +03:00
Andrey Filipenkov
002e09fa2d [macOS] set copyright to Info.plist 2022-10-22 16:52:47 +03:00
Andrey Filipenkov
c9198311a1 [macOS] set bundle identifier to Info.plist 2022-10-22 16:52:27 +03:00
Andrii Danylchenko
b43e0ff9e4
Merge pull request #972 from vcmi/cpp-map-editor 
Cpp map editor
 2022-10-22 12:42:27 +03:00
Andrii Danylchenko
c2cc801f60
Merge pull request #1073 from kambala-decapitator/ios-conan 
[Conan] add iOS support, bump dependencies, improvements
 2022-10-22 12:40:48 +03:00
Andrii Danylchenko
bae4750e93
Merge pull request #1078 from Nordsoft91/advspell-mech-fix 
[1072] Fix advmap spell mechanics
 2022-10-22 12:30:34 +03:00
Andrii Danylchenko
91dc94c66b
Merge pull request #1079 from Nordsoft91/fix-screenshots-param 
Fix screenshots loading
 2022-10-22 12:30:15 +03:00
nordsoft
e54c9af24e Continue development 2022-10-21 20:29:27 +04:00
nordsoft
b58f70ac5e Prototype 2022-10-21 05:53:30 +04:00
nordsoft
2409bdfbda Fix screenshots loading 2022-10-21 04:03:54 +04:00
nordsoft
750f160276 Fix advmap spell mechanics 2022-10-20 22:34:27 +04:00
Andrii Danylchenko
c32d44190e
Merge pull request #1075 from Nordsoft91/town-entrance-fix 
[1069] Fix bug related to town entrance
 2022-10-19 13:42:33 +03:00
Andrii Danylchenko
288f36c0c3
Merge pull request #1052 from Nordsoft91/mp-disconnection 
MP handle disconnection
 2022-10-19 09:56:18 +03:00
nordsoft
7bcb318593 Fix bug related to town entrance 2022-10-19 02:54:06 +04:00
nordsoft
0adae7bb0d Revert "Fix crash for disconnecting client" 
This reverts commit 28ab1e9777.
 2022-10-19 00:14:16 +04:00
Andrey Filipenkov
36e5fff1f3 update gitignore 2022-10-18 20:50:38 +03:00
Andrey Filipenkov
bf897311d9 [macOS] don't fail if macdeployqt is missing 
- it's needed only at install time (when creating dmg)
- ConanCenter binaries don't have it
 2022-10-18 20:50:38 +03:00
Andrey Filipenkov
409ab51036 [iOS] workaround having TBB symlink in NullkillerAI’s RPATH 
AltStore doesn't sign symlinks
 2022-10-18 20:50:38 +03: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
73b0b7c8a3 [Conan] add docs 2022-10-18 20:50:37 +03:00
Andrey Filipenkov
c1ef07a5e4 [Conan] generate all configs by default 
env var change: USE_CONAN_WITH_ALL_CONFIGS -> GENERATE_ONLY_BUILT_CONFIG
 2022-10-18 10:12:05 +03:00
Andrey Filipenkov
cf34c8da56 [Conan] add option to use Apple system libraries as overrides 2022-10-18 10:11:37 +03:00
nordsoft
fe942902df Fix road bug 2022-10-17 02:23:26 +04:00
nordsoft
d5403d3eb9 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-17 01:39:11 +04:00
nordsoft
9ead21326a Partially implement seerhuts 2022-10-17 01:16:27 +04:00
nordsoft
d9819d3a20 Attempt to fix compilation 2022-10-16 15:37:01 +04:00
Andrey Filipenkov
1e8be46ced [Conan] use semver 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
3a0d11b38a [Conan] add option to use default options of dependencies 
this allows consuming prebuilt binaries from CCI
name: default_options_of_requirements
 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
77d0fa8659 [Conan] add options to control usage of FFmpeg and LuaJIT 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
d0d4049158 [Conan] remove no longer needed Boost workaround 2022-10-16 13:25:38 +03:00
Andrey Filipenkov
f10e5e3b99 [Conan] add iOS support 2022-10-16 13:25:38 +03:00
nordsoft
5bac36ba38 Attempt to fix compilation 2022-10-16 14:22:34 +04:00
nordsoft
4b0815d9db Attempt to fix compilation 2022-10-16 13:49:47 +04:00
Andrii Danylchenko
43db37bf45
Merge pull request #1068 from vcmi/nk-retreat 
NKAI retreat
 2022-10-16 11:57:28 +03:00
nordsoft
3de6569dab Fix rewards nullptr bug 2022-10-16 03:42:21 +04:00
nordsoft
cd28a0791b Fix rewards bug 2022-10-16 03:26:19 +04:00
nordsoft
dd463ca95a Add seerhut rewards 2022-10-16 03:20:24 +04:00
nordsoft
36b87689f9 Enable editor for 32bit platform 2022-10-16 00:20:21 +04:00
Andrii Danylchenko
e9c725181c NKAI: fix retreat logic 2022-10-15 15:15:12 +03:00