games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity
21,176 Commits 22 Branches 70 Tags
develop
Commit Graph

21176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
George King
32ad963d19 Correct shortcuts for beta / develop branches 2025-10-22 10:59:48 +02:00
Laserlicht
2bee582cc7 fix 2025-10-21 22:40:46 +02:00
Laserlicht
7a7ba74907 review 2025-10-21 22:30:32 +02:00
Michał Zaremba
f2755d6089 Fix crash on calling translate command 2025-10-20 10:01:09 +02:00
Andrey Filipenkov
6407d9cac3 Merge pull request #6227 from kambala-decapitator/msvc-v142 
[windows] use msvc v142 toolset for Intel builds
 2025-10-19 15:04:21 +03:00
Andrey Filipenkov
731dbb590b [docs][Conan] update msvc toolset used 2025-10-19 14:14:54 +03:00
Ivan Savenko
4ffd1b6309 Merge pull request #6230 from Opuszek/fix_editor_display_blocking_of_objects 
Rework drawing objects and fix drawing locked objects
 2025-10-19 09:21:13 +03:00
Ivan Savenko
085b9f17ec Merge pull request #6126 from MichalZr6/bad_maps_handling 
Map loader/saver rework: fix empty modScope
 2025-10-19 08:38:51 +03:00
Ivan Savenko
4e790493d6 Merge pull request #6231 from kambala-decapitator/conan-windows-powershell 
[windows] generate bat files that use conanrun.ps1
 2025-10-19 08:38:22 +03:00
Ivan Savenko
742d6b08f5 Merge pull request #6210 from vcmi/bot/qt-translation-refresh/develop 
Auto-update Qt translation files
 2025-10-19 08:37:45 +03:00
Ivan Savenko
77e6e77f62 Merge pull request #6220 from XCOM-HUB/patch-1 
Update swedish.ts
 2025-10-19 08:37:32 +03:00
Ivan Savenko
2aa2157145 Merge pull request #6221 from MichalZr6/fix_for_Awar_map 
Fix buffered stream growth & decode river type from low 3 bits (compat for “A War” AB map)
 2025-10-19 08:37:16 +03:00
Ivan Savenko
7db19825f9 Merge pull request #6222 from Laserlicht/showincome 
Show daily income in popup
 2025-10-19 08:35:58 +03:00
Ivan Savenko
efa4be1b98 Merge pull request #6223 from Laserlicht/popup_coloor 
Colorize opponent hero / castle / garison details frame
 2025-10-19 08:35:06 +03:00
Ivan Savenko
6ff197d135 Merge pull request #6234 from MichalZr6/multiplayer_fix 
Fix multiplayer lobby issues when 2 and more players join
 2025-10-19 08:20:42 +03:00
Ivan Savenko
59033912b2 Merge pull request #6235 from MichalZr6/trimming_func_fix 
Fix trimTextIfTooWide function for object's search window
 2025-10-19 08:18:34 +03:00
Michał Zaremba
30c58f0ffa Fix trimTextIfTooWide function 2025-10-17 20:50:47 +02:00
Michał Zaremba
e14f7deca1 Fix empty modscopes 2025-10-17 19:11:40 +02:00
Michał Zaremba
3e486a779d Fix incrementing conn and player IDs 2025-10-17 16:56:01 +02:00
Michał Zaremba
35543bef7a Revert "Fix incrementing PlayerConnectionID" 
This reverts commit 48a683ae49.
 2025-10-17 16:56:01 +02:00
Andrey Filipenkov
ea77e3ef39 [docs][windows] no longer require running conan install in Powershell twice 2025-10-16 14:23:51 +03:00
Andrey Filipenkov
07b41f53cb [cmake][windows] generate bat files that use conanrun.ps1 2025-10-16 14:23:51 +03:00
Opuszek
040362a111 Rework drawing objects and fix drawing locked objects 2025-10-16 12:39:26 +02:00
Andrey Filipenkov
6a17ff7e1e [CI] use only platform name to provide user-friendly build name in the summary script 2025-10-15 10:18:24 +03:00
Andrey Filipenkov
c80d228ec8 [CI][windows] reference conanrun.ps1 script from an environment variable 2025-10-15 10:18:24 +03:00
Andrey Filipenkov
f6a5f5da22 [CI][windows] don't set CL explicitly 2025-10-15 10:16:56 +03:00