1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-08 23:22:25 +02:00
Commit Graph

21075 Commits

Author SHA1 Message Date
IvanSavenko
526b465bfe Auto-update VCMI Qt translation files 2025-10-05 00:26:44 +00:00
Ivan Savenko
da79b27547 Merge pull request #6164 from Laserlicht/resbar
Resourcebar in adventuremap
2025-10-04 15:01:56 +03:00
Ivan Savenko
8ad9b1d526 Merge pull request #6184 from Laserlicht/mines
Mines configurable
2025-10-04 14:59:59 +03:00
Ivan Savenko
833541f55f Merge pull request #6206 from Laserlicht/lobby_button
allow global lobby as button
2025-10-04 14:59:10 +03:00
Ivan Savenko
493e9f0f93 Merge pull request #6198 from Laserlicht/bonus_text
fix bonus text pos
2025-10-04 14:58:12 +03:00
Ivan Savenko
7a158fb4dc Merge pull request #6203 from Laserlicht/async_fix
fix incorrect button color with async upscaling
2025-10-04 14:58:02 +03:00
Ivan Savenko
3094143772 Merge pull request #6204 from Laserlicht/res_fix
fix deserializion of ResourceSet for compatibility
2025-10-04 14:57:44 +03:00
Laserlicht
01ef04a4b2 allow global lobby as button 2025-10-04 13:12:18 +02:00
Laserlicht
967283beb6 fix deserializion of ResourceSet for compatibility 2025-10-03 18:27:55 +02:00
Laserlicht
1a4d895ec3 fixed resource amount for abandoned 2025-10-03 16:37:22 +02:00
Laserlicht
5973c6cca3 fix inncorect button color with async upscaling 2025-10-03 15:49:45 +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
Laserlicht
c8b0bfd9f9 fix bonus text pos 2025-10-02 21:30:57 +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
Laserlicht
739b165387 fix 2025-10-01 19:07:52 +02:00
Laserlicht
74957bce32 fix for c++ 2011 2025-10-01 10:27:56 +02:00
Laserlicht
c72a4b0294 fix mines serializer 2025-10-01 00:46:40 +02:00
Laserlicht
57a49838ec fixed scope 2025-09-30 20:45:38 +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
Laserlicht
6fa342321c fix resource silo warning 2025-09-29 20:28:43 +02:00
Laserlicht
2625b44979 add error 2025-09-29 02:19:35 +02:00
Laserlicht
21bc568e59 moddable amount for mines 2025-09-29 02:00:04 +02:00
Laserlicht
c9d866aed8 texts for mine 2025-09-29 01:39:50 +02:00
Laserlicht
7314bb2d06 remove todo 2025-09-29 01:15:04 +02:00
Laserlicht
07659e3b25 fix mine handler for rmg 2025-09-29 01:01:54 +02:00
Laserlicht
5ae4db60e3 add mines support 2025-09-28 22:47:41 +02:00
Laserlicht
d921a5c528 make sonar happy 2025-09-28 22:20:00 +02:00
Laserlicht
e4cd9895be make sonar happy 2025-09-28 22:16:21 +02:00
Laserlicht
08116b13de remove todo 2025-09-28 21:57:58 +02:00
Laserlicht
dc75ac0185 Merge pull request #5 from Laserlicht/merg
merge dev
2025-09-28 21:12:10 +02:00
Laserlicht
5fbca18e8f Merge branch 'resbar' into merg 2025-09-28 21:11:51 +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