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

21316 Commits

Author SHA1 Message Date
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
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
Andrey Filipenkov
0f73d1d6b7 [CI][windows] use amd64_x86 environment to make 32-bit build 2025-10-15 10:16:55 +03:00
Andrey Filipenkov
26cc3afed5 [CI][windows] use msvc v142 toolset for Intel builds 2025-10-15 10:16:55 +03:00
Laserlicht
1fbcdb4884 fix md 2025-10-12 16:48:54 +02:00
Laserlicht
5a64fbd89c show invisible 2025-10-12 16:26:44 +02:00
IvanSavenko
db6333cc21 Auto-update VCMI Qt translation files 2025-10-12 00:25:08 +00:00
Laserlicht
4b35c82854 color popup window 2025-10-12 01:53:37 +02:00
Laserlicht
bc1ba60ea5 place in new line 2025-10-11 22:07:32 +02:00
Laserlicht
850617afb0 show income 2025-10-11 22:01:40 +02:00
Ivan Savenko
e81d5bc973 Merge pull request #6158 from Laserlicht/gen_res_assets
generate market windows for 8/9 resources
2025-10-11 19:09:57 +03:00
Ivan Savenko
0cbe240c51 Merge pull request #6218 from MichalZr6/tile_null_fix
Avoid crash when town has out-of-bounds visitablePos (null TerrainTile)
2025-10-11 18:20:40 +03:00