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

21191 Commits

Author SHA1 Message Date
Mircea TheHonestCTO
1a30c7bf49 adjusted ResourceTraderTest.cpp after develop merge 2025-10-03 16:50:30 +02:00
Mircea TheHonestCTO
c914ca2d1a Merge branch 'develop' into feature/nullkiller2 2025-10-03 16:38:57 +02:00
Ivan Savenko
1c819edc32 Merge pull request #6197 from Laserlicht/drag_impr
left mouse drag on advmap improvement
2025-10-03 14:53:27 +03:00
Ivan Savenko
5ae40f5d3e Merge pull request #6202 from Laserlicht/resize_battle_window
resizable battle window
2025-10-03 14:53:02 +03:00
Ivan Savenko
7c6dfb4e02 Merge pull request #6188 from GeorgeK1ng/regions_validation
Fix schema for new HotA campaigns mapping
2025-10-03 14:48:53 +03:00
Ivan Savenko
3672692cba Merge pull request #6190 from GeorgeK1ng/backpack_icon
New backpack icon by Andruids
2025-10-03 14:48:37 +03:00
Ivan Savenko
ad5de71c05 Merge pull request #6196 from vcmi/dydzio0614-patch-1
Update vietnamese translation
2025-10-03 14:48:03 +03:00
Ivan Savenko
9519f9a8b2 Merge pull request #6195 from vcmi/dependabot/github_actions/peter-evans/repository-dispatch-4
Bump peter-evans/repository-dispatch from 3 to 4
2025-10-03 14:47:39 +03:00
Ivan Savenko
4eb308a797 Merge pull request #6199 from Laserlicht/fix_button_condition
Fix button condition
2025-10-03 14:46:39 +03:00
Ivan Savenko
9822027bcb Merge pull request #6200 from Laserlicht/black_tactic
fix black tactic bar
2025-10-03 14:44:08 +03:00
Laserlicht
9cfe9e931c resizable battle window 2025-10-03 03:41:59 +02:00
Laserlicht
b6086fed83 fix black tactic bar 2025-10-02 22:11:24 +02:00
Laserlicht
fc00774277 fix button condition 2025-10-02 21:55:52 +02:00
Laserlicht
2697f98d9f left mouse drag on advmap improvement 2025-10-02 21:55:29 +02:00
George King
5a51f45331 Add files via upload 2025-10-02 18:27:22 +02:00
Dydzio
b4f66bc331 Update vietnamese translation 2025-10-02 10:45:49 +02:00
dependabot[bot]
40415b8280 Bump peter-evans/repository-dispatch from 3 to 4
Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 3 to 4.
- [Release notes](https://github.com/peter-evans/repository-dispatch/releases)
- [Commits](https://github.com/peter-evans/repository-dispatch/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peter-evans/repository-dispatch
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-02 04:28:22 +00:00
Mircea TheHonestCTO
dd7ea75b25 LIBRARY->resourceTypeHandler adjustments after develop merge 2025-10-01 18:25:23 +02:00
Mircea TheHonestCTO
8674099102 fix: BuildThis.cpp compilation warning after develop merge 2025-10-01 18:24:52 +02:00
Mircea TheHonestCTO
6d370014b8 ResourceTrader.cpp remove mithril condition 2025-10-01 17:59:28 +02:00
Mircea TheHonestCTO
d43accfd95 Merge branch 'develop' into feature/nullkiller2 2025-10-01 17:56:58 +02:00
Mircea TheHonestCTO
4bdf1f915b pass EGameResID by const reference in goldApproximate function 2025-10-01 17:54:48 +02:00
Mircea TheHonestCTO
280d793a7b ResourceTrader.cpp don't sell mithril 2025-10-01 17:53:48 +02:00
George King
8ec79a3ed1 Add files via upload 2025-09-30 18:29:29 +02:00
George King
97b79cd2c0 Update campaignRegion.json 2025-09-30 11:28:04 +02:00
Ivan Savenko
076f7ba5b5 Merge pull request #6182 from Laserlicht/color_list
fixing trimming color in object list
2025-09-28 21:52:19 +03:00
Ivan Savenko
3efeacf332 Merge pull request #6181 from kambala-decapitator/mingw-leftovers
[cmake] remove MinGW Conan leftovers
2025-09-28 21:51:55 +03:00
Ivan Savenko
2ce722f1d9 Merge pull request #6180 from kambala-decapitator/macos-fix-deploy
[macOS] fix deploying package
2025-09-28 21:51:43 +03:00
Ivan Savenko
c469c6c31e Merge pull request #6136 from Laserlicht/resource
Configurable resources
2025-09-28 21:51:10 +03:00
Laserlicht
70328f1bd9 fixing trimming color in object list 2025-09-28 20:40:18 +02:00
Laserlicht
e6def84135 revert handlers 2025-09-28 20:34:48 +02:00
Laserlicht
5da8a7a4dc use resolveidentifier 2025-09-28 19:17:39 +02:00
Ivan Savenko
99462e540b Merge pull request #6150 from Laserlicht/campaignsets
Campaignsets in custom campaign menu
2025-09-28 19:23:07 +03:00
Laserlicht
c9141c183f Merge branch 'develop' into campaignsets 2025-09-28 18:19:44 +02:00
Ivan Savenko
adab720592 Merge pull request #6156 from Laserlicht/butgen
adventure map config button generation
2025-09-28 18:47:20 +03:00
Ivan Savenko
9389d8d2dd Merge pull request #6179 from vcmi/bot/qt-translation-refresh/develop
Auto-update Qt translation files
2025-09-28 18:43:42 +03:00
Ivan Savenko
a05936ae1d Merge pull request #6177 from Laserlicht/fix2
fix list in creature window
2025-09-28 18:41:51 +03:00
Ivan Savenko
66f57bd521 Merge pull request #6105 from GeorgeK1ng/garrison
Use buildin Garrison background
2025-09-28 18:12:09 +03:00
Ivan Savenko
dc8d800c4f Merge pull request #6063 from Opuszek/fix_draw_in_battle
Fixes draw in a battle
2025-09-28 18:11:09 +03:00
Andrey Filipenkov
e0dfa11b21 [cmake] remove MinGW Conan leftovers 2025-09-28 17:23:55 +03:00
Andrey Filipenkov
03c1d3790d [cmake] fail cpack/install if *deployqt tool returns error 2025-09-28 17:16:35 +03:00
Andrey Filipenkov
571f7bd699 [macOS][cmake] also copy Editor dependencies when running macdeployqt
Launcher and Editor can depend on different Qt modules
2025-09-28 17:15:50 +03:00
IvanSavenko
d4516cabc6 Auto-update VCMI Qt translation files 2025-09-28 00:27:08 +00:00
Mircea TheHonestCTO
55feee16de fix: pass tasks by reference in RecruitHeroBehavior 2025-09-27 04:27:52 +02:00
Mircea TheHonestCTO
bb7588852b refactor AIMemory replacing getObj with getObjInstance to avoid unnecessary visibility filtering when just a simple iteration over objs is desired 2025-09-27 03:36:51 +02:00
Mircea TheHonestCTO
08ae8bef5a refactor: improve comments in CGameInfoCallback and MapInfoCallback; empty line to avoid using separator as a comment in IDE 2025-09-27 03:25:45 +02:00
Laserlicht
c795af8490 fix list in creature window 2025-09-27 01:23:20 +02:00
Mircea TheHonestCTO
5dc3934720 Merge branch 'develop' into feature/nullkiller2 2025-09-26 03:06:03 +02:00
Ivan Savenko
28ce6b3dba Merge pull request #6168 from Laserlicht/kindom_dwelling_fix
fix overdrawn graphics in KindomOverview
2025-09-25 21:42:28 +03:00
Mircea TheHonestCTO
9e7f98e8ea Merge remote-tracking branch 'origin/feature/nullkiller2' into feature/nullkiller2 2025-09-25 20:24:37 +02:00