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

18822 Commits

Author SHA1 Message Date
0e1d5274ba Generate aab's only for builds on master branch 2024-10-14 13:05:09 +00:00
4dc521743c Install dependencies as separate CI step 2024-10-14 13:05:09 +00:00
1623afd35d Use Ubuntu 24.04 for mingw builds 2024-10-14 13:05:09 +00:00
b3c5e0680d Install ninja for ios CI builds 2024-10-14 13:05:09 +00:00
7183314413 Update swedish.json 2024-10-14 01:30:27 +02:00
bbe216c51a Update swedish.json 2024-10-14 01:20:56 +02:00
1e4956d3ea Update swedish.json 2024-10-14 01:03:18 +02:00
22d9ad2538 Update swedish.json 2024-10-14 00:27:59 +02:00
024778dfe8 Update swedish.json 2024-10-14 00:18:32 +02:00
d43997f5ba use sdl mixer to get audio duration 2024-10-13 21:08:43 +02:00
10ad0fc760 Split CHeroHandler.cpp/.h into 1 file per class
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
2024-10-13 14:01:09 +00:00
ad7f0416a7 Added overloaded version of getObjectHandler to CGHeroInstance 2024-10-13 13:06:31 +00:00
184d8de82e Fix typo in assertion 2024-10-13 13:06:07 +00:00
31095248ab Removed typeName and subtypeName properties from CGObjectInstance 2024-10-13 13:05:50 +00:00
4bdc503186 Workaround for prison hero reset on loading map in editor 2024-10-13 08:28:37 +00:00
640ef0ea19 Update polish.json
Added new stuff
2024-10-12 23:57:58 +02:00
f7e3641c04 fix shortcut bug; add center of selected item 2024-10-12 23:21:26 +02:00
11eaed9fef code review 2024-10-12 23:01:14 +02:00
d4d3ddf685 fused artifacts 2024-10-12 16:43:04 +03:00
c85318a873 Merge branch 'develop' into develop 2024-10-12 08:11:48 -03:00
5d2f3c0f86 Merge pull request #4764 from kdmcser/develop
do lupdate and update Chinese translation
2024-10-12 11:15:43 +03:00
b67b43c811 do lupdate and update Chinese translation 2024-10-12 13:11:35 +08:00
c838f5d0c2 Update BattleEvaluator.cpp
Restored spell-damage-calculations for units that would die from spells.
2024-10-11 20:27:18 +02:00
533806df6d Merge remote-tracking branch 'upstream/develop' into develop 2024-10-11 19:07:56 +02:00
7866179a01 Merge pull request #4762 from IvanSavenko/bugfixing
Fixes for recently reported bugs and regressions
2024-10-11 19:31:00 +03:00
c55a75cc4e Remove copy-pasted code in rewardable town building leading to hero not
registered as visitor
2024-10-11 15:02:48 +00:00
d1e7cb72c2 Fix game gang on random map generation 2024-10-11 15:02:14 +00:00
e221cdccab Fix initialization of hero type in map editor 2024-10-11 15:01:55 +00:00
115439f16a Fix town events not actually giving offered creatures 2024-10-11 15:01:18 +00:00
0c6233c77f Update swedish.json
Added new code and trimmed some texts.
2024-10-11 13:02:30 +02:00
e14ea4d7fc Merge pull request #4754 from heroesiiifan/patch-7
Fix video missing error due typo
2024-10-11 13:52:04 +03:00
a8e84c55f6 Fix some of the new warnings from sonarcloud 2024-10-11 10:45:29 +00:00
cb34b7ab50 Update portuguese.json 2024-10-10 19:58:42 -03:00
b56b6c1496 Update campaignMedia.json 2024-10-10 21:44:08 +00:00
e0e01d678a Merge pull request #4753 from IvanSavenko/misc_fixes
Fixes for regressions from recent PR's
2024-10-11 00:32:45 +03:00
bc5b8d071f Merge pull request #4751 from Laserlicht/patch-3
fix campaign name
2024-10-11 00:22:23 +03:00
d5663c8948 Fix broken layout in "Mod Validation" option 2024-10-10 21:19:56 +00:00
6bed497f2c Fix mod validation reporting failure for well-formed mods 2024-10-10 21:18:43 +00:00
dfff1eae26 Fix crash on losing a hero 2024-10-10 21:16:41 +00:00
856e1f0ef8 Merge remote-tracking branch 'upstream/develop' into develop 2024-10-10 22:51:25 +02:00
f3a6d4a93f copy name after init 2024-10-10 22:01:25 +02:00
51838f020b Merge pull request #4750 from IvanSavenko/savename_fix
Fixes missing names of saves and custom campaigns
2024-10-10 22:41:16 +03:00
eb94c9f0be Update PriorityEvaluator.cpp
AI will be more aggressive when defending their territory. And more aggressive means more willing to take losses while fighting.
2024-10-10 18:53:28 +02:00
6adaffa2c2 Update SelectionTab.cpp
Fix for save-game-list having no names.
2024-10-10 18:52:25 +02:00
341ef633a5 Fixes missing names of saves and custom campaigns 2024-10-10 16:05:50 +00:00
da32b8b58f Restore compatibility with removal of getFaction() 2024-10-10 17:33:54 +02:00
61fba1fedd Merge remote-tracking branch 'upstream/develop' into develop 2024-10-10 17:23:39 +02:00
1fc0267ad1 Merge pull request #4748 from IvanSavenko/ci_fix
Quick workaround for failing Android CI
2024-10-10 16:52:55 +03:00
15ad0440f7 Fix iOS build 2024-10-10 12:38:32 +00:00
77cd08d66a Quick workaround for failing Android CI 2024-10-10 12:31:06 +00:00