1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00

Commit Graph

  • dc9fd90f3e Merge pull request #6211 from Laserlicht/text_edit develop Ivan Savenko 2025-10-28 15:33:50 +02:00
  • a4d840f60f code review Laserlicht 2025-10-28 13:30:51 +01:00
  • 185c41810f Merge pull request #6216 from Laserlicht/tpl_search Ivan Savenko 2025-10-28 14:26:29 +02:00
  • 1870201592 Merge pull request #6245 from IvanSavenko/docs_fix Ivan Savenko 2025-10-28 12:10:52 +02:00
  • b00169e8b4 Merge pull request #6244 from vcmi/test_fix Ivan Savenko 2025-10-28 12:09:53 +02:00
  • 7b952dadca Merge pull request #6248 from vcmi/dependabot/github_actions/actions/download-artifact-6 Ivan Savenko 2025-10-28 12:08:45 +02:00
  • 1c7cc4ec53 Merge pull request #6249 from vcmi/dependabot/github_actions/actions/upload-artifact-5 Ivan Savenko 2025-10-28 12:08:20 +02:00
  • 2768db0a4a Merge pull request #6252 from Opuszek/mapeditor_fix_rivers Ivan Savenko 2025-10-28 12:07:31 +02:00
  • 4584cb7db2 Merge pull request #6255 from IvanSavenko/town_portal_fix Ivan Savenko 2025-10-28 12:06:49 +02:00
  • deb0539d71 Merge pull request #6256 from IvanSavenko/hota_seer_fix Ivan Savenko 2025-10-28 12:06:20 +02:00
  • 21d3f690b8 Fix handling of artifacts in Seer Huts on HotA maps Ivan Savenko 2025-10-27 21:18:41 +02:00
  • f9f4a8e9af Add workaround for crash on attempt to use town portal map object Ivan Savenko 2025-10-27 19:40:24 +02:00
  • b3943b917b Use town portal configuration instead of direct spell level check Ivan Savenko 2025-10-27 19:34:22 +02:00
  • 483e170f6b Fix text trimming in object window Ivan Savenko 2025-10-27 19:33:48 +02:00
  • 304ef80d0b Fixes a bug that changes rives directions when terrain type is changed in mapeditor Opuszek 2025-10-27 12:14:01 +01:00
  • ac5e3fc456 Bump actions/upload-artifact from 4 to 5 dependabot[bot] 2025-10-27 04:17:11 +00:00
  • 9a21b73a81 Bump actions/download-artifact from 5 to 6 dependabot[bot] 2025-10-27 04:16:14 +00:00
  • cf5133f285 Add missing hero specialty fields to docs Ivan Savenko 2025-10-24 17:55:47 +03:00
  • 7b6d9bd404 Try to fix failing tests in some configurations test_fix Ivan Savenko 2025-10-24 11:47:28 +03:00
  • 90930d90f8 Unify CMakePresets.json formatting - always use 4 spaces Ivan Savenko 2025-10-24 11:32:57 +03:00
  • 3bec32ac14 Try to fix tests not running on some presets Ivan Savenko 2025-10-24 11:13:34 +03:00
  • 6b4179af86 Merge pull request #6238 from GeorgeK1ng/installer_shortcuts_tweak Ivan Savenko 2025-10-24 09:21:29 +03:00
  • f08c6dc556 Merge pull request #6237 from MichalZr6/missing_callback_fix Ivan Savenko 2025-10-24 09:20:19 +03:00
  • 0a4bfcc3c9 Merge pull request #6226 from Laserlicht/showinvisible Ivan Savenko 2025-10-24 09:19:45 +03:00
  • 32ad963d19 Correct shortcuts for beta / develop branches George King 2025-10-22 10:59:48 +02:00
  • 2bee582cc7 fix Laserlicht 2025-10-21 22:40:46 +02:00
  • 7a7ba74907 review Laserlicht 2025-10-21 22:30:32 +02:00
  • f2755d6089 Fix crash on calling translate command Michał Zaremba 2025-10-20 10:01:09 +02:00
  • 6407d9cac3 Merge pull request #6227 from kambala-decapitator/msvc-v142 Andrey Filipenkov 2025-10-19 15:04:21 +03:00
  • 731dbb590b [docs][Conan] update msvc toolset used Andrey Filipenkov 2025-10-15 10:33:13 +03:00
  • 4ffd1b6309 Merge pull request #6230 from Opuszek/fix_editor_display_blocking_of_objects Ivan Savenko 2025-10-19 09:21:13 +03:00
  • 085b9f17ec Merge pull request #6126 from MichalZr6/bad_maps_handling Ivan Savenko 2025-10-19 08:38:51 +03:00
  • 4e790493d6 Merge pull request #6231 from kambala-decapitator/conan-windows-powershell Ivan Savenko 2025-10-19 08:38:22 +03:00
  • 742d6b08f5 Merge pull request #6210 from vcmi/bot/qt-translation-refresh/develop Ivan Savenko 2025-10-19 08:37:45 +03:00
  • 77e6e77f62 Merge pull request #6220 from XCOM-HUB/patch-1 Ivan Savenko 2025-10-19 08:37:32 +03:00
  • 2aa2157145 Merge pull request #6221 from MichalZr6/fix_for_Awar_map Ivan Savenko 2025-10-19 08:37:16 +03:00
  • 7db19825f9 Merge pull request #6222 from Laserlicht/showincome Ivan Savenko 2025-10-19 08:35:58 +03:00
  • efa4be1b98 Merge pull request #6223 from Laserlicht/popup_coloor Ivan Savenko 2025-10-19 08:35:06 +03:00
  • 6ff197d135 Merge pull request #6234 from MichalZr6/multiplayer_fix Ivan Savenko 2025-10-19 08:20:42 +03:00
  • 59033912b2 Merge pull request #6235 from MichalZr6/trimming_func_fix Ivan Savenko 2025-10-19 08:18:34 +03:00
  • 30c58f0ffa Fix trimTextIfTooWide function Michał Zaremba 2025-10-17 20:46:00 +02:00
  • e14f7deca1 Fix empty modscopes Michał Zaremba 2025-10-01 11:14:29 +02:00
  • 3e486a779d Fix incrementing conn and player IDs Michał Zaremba 2025-10-06 12:35:21 +02:00
  • 35543bef7a Revert "Fix incrementing PlayerConnectionID" Michał Zaremba 2025-10-06 10:26:03 +02:00
  • ea77e3ef39 [docs][windows] no longer require running conan install in Powershell twice Andrey Filipenkov 2025-10-16 14:21:47 +03:00
  • 07b41f53cb [cmake][windows] generate bat files that use conanrun.ps1 Andrey Filipenkov 2025-10-16 14:21:29 +03:00
  • 040362a111 Rework drawing objects and fix drawing locked objects Opuszek 2025-10-15 23:55:08 +02:00
  • 6a17ff7e1e [CI] use only platform name to provide user-friendly build name in the summary script Andrey Filipenkov 2025-10-14 11:57:23 +03:00
  • c80d228ec8 [CI][windows] reference conanrun.ps1 script from an environment variable Andrey Filipenkov 2025-10-14 11:57:31 +03:00
  • f6a5f5da22 [CI][windows] don't set CL explicitly Andrey Filipenkov 2025-10-14 09:41:39 +03:00
  • 0f73d1d6b7 [CI][windows] use amd64_x86 environment to make 32-bit build Andrey Filipenkov 2025-10-15 10:06:16 +03:00
  • 26cc3afed5 [CI][windows] use msvc v142 toolset for Intel builds Andrey Filipenkov 2025-10-13 21:07:53 +03:00
  • 1fbcdb4884 fix md Laserlicht 2025-10-12 16:48:54 +02:00
  • 5a64fbd89c show invisible Laserlicht 2025-10-12 16:26:44 +02:00
  • db6333cc21 Auto-update VCMI Qt translation files IvanSavenko 2025-10-12 00:25:08 +00:00
  • 4b35c82854 color popup window Laserlicht 2025-10-12 01:53:37 +02:00
  • bc1ba60ea5 place in new line Laserlicht 2025-10-11 22:07:32 +02:00
  • 850617afb0 show income Laserlicht 2025-10-11 22:01:40 +02:00
  • e81d5bc973 Merge pull request #6158 from Laserlicht/gen_res_assets Ivan Savenko 2025-10-11 19:09:57 +03:00
  • 0cbe240c51 Merge pull request #6218 from MichalZr6/tile_null_fix Ivan Savenko 2025-10-11 18:20:40 +03:00
  • d2ac0fd4ff fix CBufferedStream::ensureSize growth & read semantics (compat for 'A War' map) Michał Zaremba 2025-10-11 09:26:14 +02:00
  • 565e45650d Update swedish.ts Maurycy 2025-10-09 20:57:23 +02:00
  • 76b7bee2f4 Update swedish.ts Maurycy 2025-10-09 20:08:19 +02:00
  • 768b233813 fix Laserlicht 2025-10-09 00:01:00 +02:00
  • 90924a74ef Fix null tile being processed in CGTownInstance::updateAppearance Michał Zaremba 2025-10-08 12:10:24 +02:00
  • 64c44ce887 template search Laserlicht 2025-10-08 01:12:57 +02:00
  • ace5425433 Merge pull request #6215 from kambala-decapitator/ios-rpath-symlinks Andrey Filipenkov 2025-10-07 15:28:17 +03:00
  • b7aefc198c [iOS] ensure that all RPATH entries of dependencies point to real files Andrey Filipenkov 2025-10-07 15:00:32 +03:00
  • 7b793bfd78 Merge pull request #6173 from Opuszek/improve_editor_performance Ivan Savenko 2025-10-07 11:51:37 +03:00
  • da9ba62110 Merge pull request #6209 from Laserlicht/kingdomoverview_res Ivan Savenko 2025-10-07 11:47:44 +03:00
  • 00b5839d36 Merge pull request #6213 from GeorgeK1ng/fix_tests Ivan Savenko 2025-10-07 10:21:43 +03:00
  • f13e00850f Merge pull request #6214 from Laserlicht/puzzle Ivan Savenko 2025-10-07 10:21:26 +03:00
  • 0c929b8fd8 Code review fix Opuszek 2025-10-06 20:52:25 +02:00
  • faad200aed Improve editor performance Opuszek 2025-10-06 20:33:09 +02:00
  • 0fad70cac7 puzzlemap fine tuning Laserlicht 2025-10-05 20:31:48 +02:00
  • 6c1748e0d6 fix allied towns & color text input Laserlicht 2025-10-05 14:24:29 +02:00
  • 870e90b4d5 Add missing presets George King 2025-10-05 13:45:30 +02:00
  • 4fcca634ea Use performNativeCopy instead of copy (#6185) George King 2025-10-05 11:21:20 +02:00
  • e8a8a5b13c Merge pull request #6208 from smanolloff/remove-vector-inheritance Ivan Savenko 2025-10-05 12:19:10 +03:00
  • fb7f49c41d Merge pull request #6207 from Laserlicht/cal_icon Ivan Savenko 2025-10-05 12:15:41 +03:00
  • 19ff1a224c Merge pull request #6193 from MichalZr6/mod_incompability_errors Ivan Savenko 2025-10-05 12:15:17 +03:00
  • 85a9a62cd4 Merge pull request #6148 from MichalZr6/fix_remove_artifacts Ivan Savenko 2025-10-05 11:55:02 +03:00
  • 91101d26fa Remove std::vector inheritance Simeon Manolov 2025-09-28 00:48:42 +03:00
  • 3e2a526140 correct update Laserlicht 2025-10-05 03:18:47 +02:00
  • 120213509d netpacks for renaming Laserlicht 2025-10-05 02:46:19 +02:00
  • 115d90cbb3 small refactoring Laserlicht 2025-10-05 02:03:18 +02:00
  • e6272fe477 fix length Laserlicht 2025-10-05 01:57:01 +02:00
  • f5d1657041 make town title editable Laserlicht 2025-10-05 01:49:00 +02:00
  • 7c74f34ddc fix Laserlicht 2025-10-04 17:43:37 +02:00
  • e1eba7c231 docs Laserlicht 2025-10-04 17:35:59 +02:00
  • 46619f35fe load mine image in kingdom overview Laserlicht 2025-10-04 17:14:24 +02:00
  • 81f713a2b0 add slider for new mines Laserlicht 2025-10-04 16:21:07 +02:00
  • 56db9e5f34 adjusted calendar icon to h3 look Laserlicht 2025-10-04 15:22:05 +02:00
  • 7cf771d4f7 Merge branch 'vcmi:develop' into gen_res_assets Laserlicht 2025-10-04 14:12:29 +02:00
  • da79b27547 Merge pull request #6164 from Laserlicht/resbar Ivan Savenko 2025-10-04 15:01:56 +03:00
  • 8ad9b1d526 Merge pull request #6184 from Laserlicht/mines Ivan Savenko 2025-10-04 14:59:59 +03:00
  • 833541f55f Merge pull request #6206 from Laserlicht/lobby_button Ivan Savenko 2025-10-04 14:59:10 +03:00
  • 493e9f0f93 Merge pull request #6198 from Laserlicht/bonus_text Ivan Savenko 2025-10-04 14:58:12 +03:00
  • 7a158fb4dc Merge pull request #6203 from Laserlicht/async_fix Ivan Savenko 2025-10-04 14:58:02 +03:00
  • 3094143772 Merge pull request #6204 from Laserlicht/res_fix Ivan Savenko 2025-10-04 14:57:44 +03:00