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

21492 Commits

Author SHA1 Message Date
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
Mircea TheHonestCTO
31cd821066 Merge branch 'develop' into feature/nullkiller2 2025-10-15 11:59:08 +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
Michał Zaremba
d2ac0fd4ff fix CBufferedStream::ensureSize growth & read semantics (compat for 'A War' map) 2025-10-11 09:38:06 +02:00
Maurycy
565e45650d Update swedish.ts
Build Information = Kompilationsinformation
2025-10-09 20:57:23 +02:00
Maurycy
76b7bee2f4 Update swedish.ts 2025-10-09 20:08:19 +02:00
Laserlicht
768b233813 fix 2025-10-09 00:01:00 +02:00
Michał Zaremba
90924a74ef Fix null tile being processed in CGTownInstance::updateAppearance 2025-10-08 12:10:24 +02:00
Laserlicht
64c44ce887 template search 2025-10-08 01:12:57 +02:00
Andrey Filipenkov
ace5425433 Merge pull request #6215 from kambala-decapitator/ios-rpath-symlinks
[iOS] ensure that all RPATH entries of dependencies point to real files
2025-10-07 15:28:17 +03:00
Andrey Filipenkov
b7aefc198c [iOS] ensure that all RPATH entries of dependencies point to real files
AltStore has issues with symlinks to dylibs
2025-10-07 15:01:10 +03:00
Ivan Savenko
7b793bfd78 Merge pull request #6173 from Opuszek/improve_editor_performance
Improve editor performance
2025-10-07 11:51:37 +03:00
Ivan Savenko
da9ba62110 Merge pull request #6209 from Laserlicht/kingdomoverview_res
Kingdomoverview additional mines
2025-10-07 11:47:44 +03:00
Ivan Savenko
00b5839d36 Merge pull request #6213 from GeorgeK1ng/fix_tests
Add missing presets for test
2025-10-07 10:21:43 +03:00
Ivan Savenko
f13e00850f Merge pull request #6214 from Laserlicht/puzzle
puzzlemap fine tuning
2025-10-07 10:21:26 +03:00
Opuszek
0c929b8fd8 Code review fix 2025-10-06 20:52:25 +02:00
Opuszek
faad200aed Improve editor performance 2025-10-06 20:34:17 +02:00
Laserlicht
0fad70cac7 puzzlemap fine tuning 2025-10-05 20:31:48 +02:00
Laserlicht
6c1748e0d6 fix allied towns & color text input 2025-10-05 14:24:29 +02:00
George King
870e90b4d5 Add missing presets 2025-10-05 13:45:30 +02:00
George King
4fcca634ea Use performNativeCopy instead of copy (#6185) 2025-10-05 12:21:20 +03:00
Ivan Savenko
e8a8a5b13c Merge pull request #6208 from smanolloff/remove-vector-inheritance
Remove std::vector inheritance
2025-10-05 12:19:10 +03:00
Ivan Savenko
fb7f49c41d Merge pull request #6207 from Laserlicht/cal_icon
adjusted calendar icon to h3 look
2025-10-05 12:15:41 +03:00
Ivan Savenko
19ff1a224c Merge pull request #6193 from MichalZr6/mod_incompability_errors
Rework handling some errors and uncought exceptions
2025-10-05 12:15:17 +03:00
Ivan Savenko
85a9a62cd4 Merge pull request #6148 from MichalZr6/fix_remove_artifacts
Minor fixes for artifact removal during map load and handling null map objects
2025-10-05 11:55:02 +03:00