1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Commit Graph

20779 Commits

Author SHA1 Message Date
Opuszek
10a4a3adee Fixes build warning in Potential Targets 2025-08-24 14:42:42 +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
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
Laserlicht
5436abf000 improve docs 2025-08-16 13:17:28 +02:00
Mircea TheHonestCTO
8861b8745d revert: back to 0.5% monthly monster chance 2025-08-15 16:15:16 +02:00
Andrey Filipenkov
06dbe32c77 Merge pull request #6013 from kambala-decapitator/gradlew-crlf
force correct line endings for Gradle wrapper
2025-08-15 16:40:36 +03:00
Mircea TheHonestCTO
39bd4a2d20 refactoring with guardingCreaturePosition 2025-08-15 00:19:51 +02:00
Mircea TheHonestCTO
423eb70e2e Merge branch 'develop' into fix/monthly-random-monsters-hiding-nearby-danger 2025-08-14 23:21:20 +02:00
George King
d45e187c8b Disable settings.json write 2025-08-14 20:02:13 +02:00
George King
fb558e1369 Revert changes 2025-08-14 20:01:15 +02:00
Ivan Savenko
37d7222fb3 Merge pull request #6006 from thehonestcto/feature/code-readability-improvements
feature: make some code easier to understand and debug
2025-08-14 13:15:52 +03:00
Ivan Savenko
6328e4b4f8 Merge pull request #6002 from kdmcser/opening_battle_spells
Add addInfo support for OPENING_BATTLE_SPELL to set spell level
2025-08-14 11:19:53 +03:00
Ivan Savenko
b5ec998677 Merge pull request #6003 from vcmi/dependabot/github_actions/actions/download-artifact-5
Bump actions/download-artifact from 4 to 5
2025-08-14 11:07:20 +03:00
Ivan Savenko
b536830ace Merge pull request #5980 from SoundSSGood/artifacts-qol
Artifact qol improvements
2025-08-14 11:05:37 +03:00
Ivan Savenko
118029b2ba Merge pull request #5964 from Laserlicht/levels
multilevel support
2025-08-14 11:03:42 +03:00
Ivan Savenko
6ab632cb89 Merge pull request #6008 from ToRRent1812/patch-2
Update polish.json
2025-08-14 11:03:06 +03:00
Ivan Savenko
28958d6589 Merge pull request #6009 from vcmi/dependabot/github_actions/actions/checkout-5
Bump actions/checkout from 4 to 5
2025-08-14 11:02:40 +03:00
Ivan Savenko
5f4d587276 Merge pull request #6004 from thehonestcto/fix/highlighted-hexes
fix: placing a single hex unit during tactics into a hex which is blo…
2025-08-14 10:52:15 +03:00
Andrey Filipenkov
cbb1d35df6 force LF for UNIX version of Gradle wrapper 2025-08-14 09:38:35 +03:00