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

21201 Commits

Author SHA1 Message Date
Laserlicht
a6ea9be489 Merge branch 'develop' into battleonly 2025-10-28 14:42:27 +01:00
Laserlicht
b218542d51 code review 2025-10-28 14:39:14 +01:00
Ivan Savenko
dc9fd90f3e Merge pull request #6211 from Laserlicht/text_edit
Allowing editing town name
2025-10-28 15:33:50 +02:00
Laserlicht
a4d840f60f code review 2025-10-28 13:30:51 +01:00
Ivan Savenko
185c41810f Merge pull request #6216 from Laserlicht/tpl_search
template search
2025-10-28 14:26:29 +02:00
Laserlicht
ea001c6973 fix regression of #6255 2025-10-28 12:39:28 +01:00
Laserlicht
c202d44179 Merge branch 'develop' into battleonly 2025-10-28 12:26:57 +01:00
Ivan Savenko
1870201592 Merge pull request #6245 from IvanSavenko/docs_fix
Add missing hero specialty fields to docs
2025-10-28 12:10:52 +02:00
Ivan Savenko
b00169e8b4 Merge pull request #6244 from vcmi/test_fix
Try to fix tests not running on some presets
2025-10-28 12:09:53 +02:00
Ivan Savenko
7b952dadca Merge pull request #6248 from vcmi/dependabot/github_actions/actions/download-artifact-6
Bump actions/download-artifact from 5 to 6
2025-10-28 12:08:45 +02:00
Ivan Savenko
1c7cc4ec53 Merge pull request #6249 from vcmi/dependabot/github_actions/actions/upload-artifact-5
Bump actions/upload-artifact from 4 to 5
2025-10-28 12:08:20 +02:00
Ivan Savenko
2768db0a4a Merge pull request #6252 from Opuszek/mapeditor_fix_rivers
Fixes a bug that changes rives directions when terrain type is change…
2025-10-28 12:07:31 +02:00
Ivan Savenko
4584cb7db2 Merge pull request #6255 from IvanSavenko/town_portal_fix
Town portal spell fixes
2025-10-28 12:06:49 +02:00
Ivan Savenko
deb0539d71 Merge pull request #6256 from IvanSavenko/hota_seer_fix
Fix handling of artifacts in Seer Huts on HotA maps
2025-10-28 12:06:20 +02:00
Ivan Savenko
21d3f690b8 Fix handling of artifacts in Seer Huts on HotA maps
Fixed bug that caused artifacts in Pandora Boxes, Seer Huts/Border
guards quests, and Seer Hut rewards fail to load, resulting in
potentially broken map objects
2025-10-27 21:18:41 +02:00
Ivan Savenko
f9f4a8e9af Add workaround for crash on attempt to use town portal map object 2025-10-27 19:40:24 +02:00
Ivan Savenko
b3943b917b Use town portal configuration instead of direct spell level check 2025-10-27 19:34:22 +02:00
Ivan Savenko
483e170f6b Fix text trimming in object window
- Do not attempt to preserve object count in string when string does not
contains object count
- Correctly look up last bracket, to correctly handle object names that
contain brackets
2025-10-27 19:33:48 +02:00
Opuszek
304ef80d0b Fixes a bug that changes rives directions when terrain type is changed in mapeditor 2025-10-27 12:14:01 +01:00
dependabot[bot]
ac5e3fc456 Bump actions/upload-artifact from 4 to 5
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 04:17:11 +00:00
dependabot[bot]
9a21b73a81 Bump actions/download-artifact from 5 to 6
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 04:16:14 +00:00
Laserlicht
8bb789ec56 cleanup 2025-10-26 01:04:49 +02:00
Laserlicht
48e2d43c97 colorize & bugfix 2025-10-26 01:02:51 +02:00
Laserlicht
50db54393d ui fixes 2025-10-25 23:28:17 +02:00
Laserlicht
189acf9be4 refactor types 2025-10-25 23:08:08 +02:00
Laserlicht
05ea43438e ui update 2025-10-25 21:44:13 +02:00
Laserlicht
66f377f14e netpackages 2025-10-25 20:41:39 +02:00
Laserlicht
678d8275b7 block ui for guest 2025-10-25 19:32:56 +02:00
Laserlicht
fcdc100761 introduce BattleOnlyModeStartInfo for multiplayer 2025-10-25 19:06:28 +02:00
Laserlicht
134017a7cd basic multiplayer support 2025-10-25 17:55:25 +02:00
Laserlicht
c6730a2dcc text edit slotid directly now 2025-10-25 17:12:55 +02:00
Laserlicht
da2b565225 code review 2025-10-25 13:21:58 +02:00
Laserlicht
34ddc9343d (hopefully) fix android background 2025-10-25 03:12:04 +02:00
Laserlicht
c71e671aab new layout 2025-10-25 02:46:34 +02:00
Laserlicht
8a1062b9cd fix 2025-10-24 23:30:05 +02:00
Ivan Savenko
cf5133f285 Add missing hero specialty fields to docs
These properties are already supported in 1.7, but undocumented
2025-10-24 17:55:47 +03:00
Ivan Savenko
7b6d9bd404 Try to fix failing tests in some configurations 2025-10-24 13:01:41 +03:00
Ivan Savenko
90930d90f8 Unify CMakePresets.json formatting - always use 4 spaces 2025-10-24 11:32:57 +03:00
Ivan Savenko
3bec32ac14 Try to fix tests not running on some presets 2025-10-24 11:24:37 +03:00
Ivan Savenko
6b4179af86 Merge pull request #6238 from GeorgeK1ng/installer_shortcuts_tweak
Correct shortcuts for beta / develop branches in Windows installer
2025-10-24 09:21:29 +03:00
Ivan Savenko
f08c6dc556 Merge pull request #6237 from MichalZr6/missing_callback_fix
Fix crash on `/translate` ChatCommand
2025-10-24 09:20:19 +03:00
Ivan Savenko
0a4bfcc3c9 Merge pull request #6226 from Laserlicht/showinvisible
show invisible
2025-10-24 09:19:45 +03:00
Laserlicht
35b294611c fix regression of #6235 2025-10-24 01:14:37 +02:00
Laserlicht
5a650a8f2f Merge branch 'develop' into battleonly 2025-10-24 01:01:42 +02:00
Laserlicht
01919e241c remove asserts (fix water) 2025-10-24 00:56:20 +02:00
Laserlicht
15a85c2c5c fix pos in list popup 2025-10-24 00:56:20 +02:00
Laserlicht
ed562e42ba battleonly gui 2025-10-24 00:56:20 +02:00
Laserlicht
104fb5b308 generate blue town portal background 2025-10-24 00:54:22 +02:00
Laserlicht
4d37fe631b battle only basic implementation 2025-10-24 00:54:22 +02:00
George King
32ad963d19 Correct shortcuts for beta / develop branches 2025-10-22 10:59:48 +02:00