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
Mircea TheHonestCTO
1900e03b47 nullkiller2: Replace hasBuiltSomeTradeBuilding() with hasBuiltResourceMarketplace() 2025-11-18 18:18:35 +01:00
Mircea TheHonestCTO
3c7abd988e nullkiller2: revert NK2AI_TRACE_LEVEL to 0 for merge in develop 2025-11-16 17:59:23 +01:00
Mircea TheHonestCTO
e2851e9d00 nullkiller2: simplify hero name display by removing expensive getNameTranslated 2025-11-16 17:57:31 +01:00
Mircea TheHonestCTO
69d24111df nullkiller2: remove commented out code, plus formatting the affected file 2025-11-16 17:55:33 +01:00
Mircea
4ce3586235 Update lib/gameState/CGameState.cpp
Include Ivan's text

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-11-16 17:46:49 +01:00
Mircea TheHonestCTO
b3d65ffc44 nullkiller2: Ivan PR review: Remove invalid attack position validation log and return empty attackable tiles 2025-11-15 17:47:44 +01:00
Mircea TheHonestCTO
463ab631f8 nullkiller2: revert config/schemas/settings.json to default 2025-11-15 17:45:44 +01:00
Mircea TheHonestCTO
c40093ac5d nullkiller2: revert config/gameConfig.json to default: reduce hero and creature limits, disable dwelling accumulation 2025-11-15 17:44:46 +01:00
Mircea TheHonestCTO
6888cf0f5f nullkiller2: add scroll count to reward size calculation in priority evaluator to mirror PR from NK1 2025-11-15 17:39:05 +01:00
Mircea TheHonestCTO
0ee10c9213 Merge branch 'develop' into feature/nullkiller2 2025-11-15 17:15:46 +01:00
Ivan Savenko
81db5c7cf4 Merge pull request #6286 from GeorgeK1ng/backpack_sort
Enable backpack sorting in both ways
2025-11-12 16:34:44 +02:00
Ivan Savenko
6ecd6b98f4 Merge pull request #6296 from mrhaandi/fix-unit-surrounded
Fix violated assert(direction != BattleHex::NONE)
2025-11-12 16:34:05 +02:00
Ivan Savenko
564e0c4dea Merge pull request #6257 from Opuszek/fixes_mapeditor_crash_when_changing_terrain_beyond_map
Fixes mapeditor crashing when user changes terrain beyond map
2025-11-12 16:28:59 +02:00
Ivan Savenko
6be02f514b Merge pull request #6306 from MichalZr6/romanian_translation_update
Romanian translation update uploaded by MoWoau on Discord
2025-11-12 16:27:51 +02:00
Ivan Savenko
7f2ca6977e Merge pull request #6308 from mzsergiu/develop
Initial translation in Romanian
2025-11-12 16:27:30 +02:00
Ivan Savenko
c254801c17 Merge pull request #6310 from MichalZr6/enable_romanian_translation
Enable Romanian language in launcher
2025-11-12 16:27:18 +02:00
Michał Zaremba
a71848bb3a Enable Romanian lang in launcher 2025-11-11 21:14:40 +01:00
Andrej Dudenhefner
3b68389d67 extend isMeleeAttacker() == false to all war machines 2025-11-11 19:55:39 +01:00
Andrej Dudenhefner
7c4b7aa3f0 Move isMeleeAttacker to Unit 2025-11-11 19:38:48 +01:00
Andrej Dudenhefner
31c093baae Remove condition that a unit can always attack itself 2025-11-11 19:38:48 +01:00
Andrej Dudenhefner
3b72a74161 Add isMeleeAttacker to Unit 2025-11-11 19:38:47 +01:00
Andrej Dudenhefner
7161ce858e Consider wide units (avoiding self attack trouble) 2025-11-11 19:38:47 +01:00
Andrej Dudenhefner
8c713f73c1 Fix violated assert(direction != BattleHex::NONE) in BattleFieldController::fromWhichHexAttack when unit surrounded 2025-11-11 19:38:47 +01:00
Ivan Savenko
4d16a8d4fb Merge pull request #6262 from MichalZr6/small_fixes
Battle fixes: Sacrifice targeting, First Aid Tent possible actions. GUI: cursor init stall fix
2025-11-11 20:25:59 +02:00
Ivan Savenko
eb12bb60ec Merge pull request #6303 from Laserlicht/haptic_spellbook
add haptic feedback to spellbook
2025-11-11 20:13:06 +02:00
Ivan Savenko
53c44f3d3d Merge pull request #6304 from Laserlicht/graphical_fixes
graphical fixes
2025-11-11 20:12:39 +02:00
MoWoau
8e714342bb Initial translation in Romanian 2025-11-11 17:01:19 +02:00
Michał Zaremba
0e898d38c4 Update Romanian launcher and mapeditor translations 2025-11-11 00:09:30 +01:00
Michał Zaremba
bbc2189984 Fix Sacrifice spell 2025-11-10 23:22:36 +01:00
Michał Zaremba
d01cecdaca Initialize cursor currentFrame to 0 to avoid stall 2025-11-10 23:22:36 +01:00
Ivan Savenko
e937ebe0bc Merge pull request #6298 from GeorgeK1ng/MORE_DAMAGE_FROM_SPELL
Add MORE_DAMAGE_FROM_SPELL
2025-11-09 16:51:36 +02:00
Ivan Savenko
cfc71694cb Merge pull request #6300 from Opuszek/fix_terrain_patterns
Fix terrain patterns
2025-11-09 16:50:58 +02:00
Laserlicht
2070c68f76 fix text overflow in hero overview 2025-11-09 14:15:06 +01:00
Opuszek
7358e40aca MapEditor fixes non-standard terrain rules for dirt terrain patterns 2025-11-09 00:28:48 +01:00
Opuszek
40114c14b3 Mapeditor fix terrain patterns m4, s1 and s4 2025-11-09 00:28:23 +01:00
Laserlicht
365f87ed3e add haptics to spellbook 2025-11-09 00:06:02 +01:00
Opuszek
7a961f7a81 Code review fixes for #6173 2025-11-06 21:40:44 +01:00
George King
0d073b979b Update bonuses.json 2025-11-06 16:16:06 +01:00
Ivan Savenko
fd81dcaff0 Merge pull request #6295 from vcmi/bot/qt-translation-refresh/develop
Auto-update Qt translation files
2025-11-06 16:20:11 +02:00
IvanSavenko
2333a02fa0 Auto-update VCMI Qt translation files 2025-11-06 13:59:48 +00:00
Ivan Savenko
3a80d283a8 Merge pull request #6277 from MichalZr6/ts_translation_updates
[launcher] [mapeditor] Updated UI translations for 18 languages - please review your locale
2025-11-06 15:12:28 +02:00
Ivan Savenko
7cabae89e3 Merge pull request #6243 from Laserlicht/battleonly
Battleonly mode
2025-11-06 14:33:44 +02:00
Ivan Savenko
56b63a68cb Merge pull request #6294 from mrhaandi/fix-ai-dividebyzero
Fix division by zero in RewardEvaluator::getArmyReward
2025-11-06 14:31:05 +02:00
Ivan Savenko
7a00b18556 Merge pull request #6291 from mrhaandi/fix-artifact-nullptr
Fix artifact->artifactID.hasValue() nullptr
2025-11-06 14:30:58 +02:00
Andrej Dudenhefner
6253e8321b Fix division by zero in RewardEvaluator::getArmyReward 2025-11-06 12:24:30 +01:00
George King
6978d87a97 Make sonar happy 2025-11-06 10:07:48 +01:00
Laserlicht
5718416ebf code review + fixes 2025-11-05 20:35:38 +01:00
Andrej Dudenhefner
6325ec705d Fix artifact->artifactID.hasValue() nullptr 2025-11-04 19:24:46 +01:00
Ivan Savenko
a7097767e1 Merge pull request #6279 from GeorgeK1ng/ALWAYS_MAXIMUM_DAMAGE
Fix for ALWAYS_MAXIMUM_DAMAGE bonus
2025-11-04 16:33:55 +02:00
Ivan Savenko
01fb25e096 Merge pull request #6284 from GeorgeK1ng/commander_button
Fix commander abilities button position
2025-11-04 15:55:51 +02:00