1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Commit Graph

20795 Commits

Author SHA1 Message Date
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
5e2355dde2 [cmake][launcher] innoextract: disable libiconv
on Android it finds it in the toolchain but that one is usable only since API level 28
2025-08-28 16:05:10 +03:00
Andrey Filipenkov
5028af75cf [conan] migrate to v2 2025-08-28 16:05:10 +03:00
Andrey Filipenkov
53fbe2efa5 [android] gradle cleanup 2025-08-28 16:05:10 +03:00
Andrey Filipenkov
932bfdeeb6 [android] fix comment about SDL 2025-08-28 16:05:10 +03:00
Andrey Filipenkov
6c08c23fbf Merge pull request #6074 from vcmi/dependabot/github_actions/actions/checkout-5
Bump actions/checkout from 4 to 5
2025-08-28 16:03:19 +03:00
dependabot[bot]
79fa4a476c Bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-28 06:19:24 +00:00
Ivan Savenko
66151abe29 Merge pull request #6055 from GeorgeK1ng/ccache
Add working cache for Windows / Android
2025-08-27 21:27:50 +03:00
George King
269f64de0c Update .github/workflows/github.yml
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2025-08-27 01:18:04 +02:00
George King
8bf8f570f4 Update github.yml 2025-08-26 10:57:35 +02:00
George King
8dbb2d62dd Add comments 2025-08-26 10:11:11 +02:00
George King
62e9708700 Update github.yml 2025-08-24 09:48:27 +02:00
George King
ee32a64428 Update github.yml 2025-08-24 08:19:29 +02:00
Ivan Savenko
72bc79adaa Merge pull request #6041 from vcmi/dependabot/github_actions/actions/setup-java-5
Bump actions/setup-java from 4 to 5
2025-08-23 21:59:55 +03:00
Ivan Savenko
bf14c3f6d5 Merge pull request #6043 from kdmcser/chinese
update Chinese translation
2025-08-23 21:55:00 +03:00
Ivan Savenko
ce9948587d Merge pull request #6040 from kdmcser/commander_position_fix
move commander start position to 94 to avoid overlap
2025-08-23 21:52:02 +03:00
Ivan Savenko
454fc8af9c Merge pull request #6042 from kambala-decapitator/launcher-proxy
[launcher] use system proxy
2025-08-23 21:51:31 +03:00
Ivan Savenko
bdbd96fa6c Merge pull request #6047 from kambala-decapitator/macos-icon
[macOS] update app icon and generation script
2025-08-23 21:47:14 +03:00
Ivan Savenko
467a5a9713 Merge pull request #6048 from MichalZr6/develop
Fix template.json schema and insert@/modify@ in JsonUtils::merge function
2025-08-23 21:41:12 +03:00
George King
2bd18ec430 Remove Czech comment leftover 2025-08-23 20:24:55 +02:00
George King
5c7f385b43 Update github.yml 2025-08-23 20:02:44 +02:00
George King
e6ec9d932b Update github.yml 2025-08-23 19:13:12 +02:00
George King
2eaba9fafb Add files via upload 2025-08-23 19:12:55 +02:00
Michał Zaremba
be736eb1b2 fix for insert@/modify@ in JsonUtils::merge; minor typo fixes 2025-08-22 15:53:00 +02:00
Michał Zaremba
6206633e4c Fix template.json schema 2025-08-22 15:53:00 +02:00
Andrey Filipenkov
2baae9d39d [macOS] update app icon and generation script 2025-08-22 16:32:17 +03:00
kdmcser
b8fb02db36 update Chinese translation 2025-08-22 01:17:20 +08:00
Andrey Filipenkov
ed40774971 [launcher] use system proxy 2025-08-21 12:39:25 +03:00
Ivan Savenko
154645da68 Merge pull request #6034 from kambala-decapitator/launcher-improvement
small Launcher improvements
2025-08-21 09:41:30 +03:00
Ivan Savenko
433ce70c90 Merge pull request #6035 from kdmcser/vcmi_mod_fix
fix 6lm10a road
2025-08-21 09:40:46 +03:00
dependabot[bot]
c86149517e Bump actions/setup-java from 4 to 5
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-21 04:38:42 +00:00
kdmcser
0943b85a47 move commander start position to 94 to avoid overlap 2025-08-21 02:03:11 +08:00
kdmcser
e3c086bfef fix 6lm10a road 2025-08-20 00:38:28 +08:00
Andrey Filipenkov
cc921a6b45 clean trailing whitespace 2025-08-19 18:59:39 +03:00
Andrey Filipenkov
1a7bf57cb3 add Q_EMIT to signals 2025-08-19 18:59:39 +03:00
Andrey Filipenkov
97b7a57c59 fix Abort button name in code 2025-08-19 18:59:39 +03:00
Ivan Savenko
9a66130c12 Merge pull request #5961 from Opuszek/rework_ballist_and_tower_target_acquisition
Rework ballist and tower target acquisition
2025-08-18 22:17:07 +03:00
Ivan Savenko
b5b548d532 Merge pull request #6030 from Laserlicht/patch-2
Fix crash if ID not exists
2025-08-18 22:11:05 +03:00
Ivan Savenko
c50cdadd60 Merge pull request #6026 from kambala-decapitator/macos15-install
update macOS installation instructions for macOS 15
2025-08-18 22:10:43 +03:00
Ivan Savenko
b45e3b7732 Merge pull request #6021 from kdmcser/undead_raise
make UNDEAD_RAISE_PERCENTAGE compatible with 1.6 when setting to 0
2025-08-18 22:09:55 +03:00
Ivan Savenko
447f5ca47c Merge pull request #6019 from Laserlicht/docs_cheat
improve cheat docs
2025-08-18 22:09:40 +03:00
Ivan Savenko
fe2a97fd0a Merge pull request #6017 from Laserlicht/boost_fix
Fix build with Boost 1.89.0
2025-08-18 22:09:19 +03:00
Ivan Savenko
6bb5711ded Merge pull request #6005 from thehonestcto/fix/monthly-random-monsters-hiding-nearby-danger
fix: monthly monsters aren't linked with other map objects at creatio…
2025-08-18 22:08:45 +03:00
Ivan Savenko
6850f3d37c Merge pull request #5971 from GeorgeK1ng/future_installer_update
Installer improvements
2025-08-18 22:02:47 +03:00
Andrey Filipenkov
f8ce0e2bee Merge pull request #6029 from Laserlicht/patch-1
Fix android artifacts
2025-08-17 20:11:32 +03:00
Laserlicht
f7adb39551 Fix crash if ID not exists 2025-08-17 16:55:03 +02:00
Laserlicht
f464a0bb99 Fix android artifacts 2025-08-17 16:32:20 +02:00
Laserlicht
62dc6bc6a3 Fix build with Boost 1.89.0 2025-08-17 16:30:57 +02:00
Andrey Filipenkov
fa0ba8b68c update macOS installation instructions for macOS 15 2025-08-17 16:34:12 +03:00
kdmcser
25c987beab make UNDEAD_RAISE_PERCENTAGE compatible with 1.6 when setting to 0 2025-08-17 01:11:31 +08:00