Mircea TheHonestCTO
5c6f2faebb
Merge branch 'develop' into feature/nullkiller2
2025-11-19 17:47:18 +01:00
Mircea TheHonestCTO
1900e03b47
nullkiller2: Replace hasBuiltSomeTradeBuilding() with hasBuiltResourceMarketplace()
2025-11-18 18:18:35 +01:00
Ivan Savenko
2db925347e
Merge pull request #6316 from mrhaandi/battle-ended
...
Add BattleEnded pack
2025-11-18 17:50:35 +02:00
Ivan Savenko
413eeed1da
Merge pull request #6323 from MichalZr6/haven_bonus_limit_fix
...
Prevent crash when opening stack's info window in current Haven town fort window
2025-11-17 20:49:27 +02:00
Ivan Savenko
7b4a7799cc
Merge pull request #6301 from Laserlicht/battleonly2
...
tab support / add artifacts, skills, warmachines & spellbook for battle mode
2025-11-17 20:38:51 +02:00
Ivan Savenko
97edd4936b
Merge pull request #6307 from mrhaandi/battle-refactor
...
Refactor batte move / attack logic
2025-11-17 20:27:03 +02:00
Ivan Savenko
6f1c2e7d94
Merge pull request #6319 from Laserlicht/segfault
...
fix segfault edge case in CObjectListWindow
2025-11-17 20:25:51 +02:00
Ivan Savenko
f99b98c26b
Merge pull request #6325 from Laserlicht/image_from_Def
...
image from def also for ImageLocator
2025-11-17 20:22:58 +02:00
Ivan Savenko
ce95236123
Merge pull request #6322 from Laserlicht/teleport
...
teleport cheat
2025-11-17 08:52:47 +02:00
Ivan Savenko
fe22424a0a
Merge pull request #6311 from MichalZr6/fix_word_wrap
...
Prevent mid-word wrapping in component captions (artifact names)
2025-11-17 08:51:29 +02:00
Ivan Savenko
3ff797d8a0
Merge pull request #6320 from Laserlicht/romainan-fix
...
fix romanian encoding
2025-11-17 08:50:47 +02:00
Laserlicht
cad21dd627
image from def also for ImageLocator
2025-11-17 00:15:54 +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
Michał Zaremba
6ee1e7a5c7
Prevent crash when opening stack's info window in fort
2025-11-16 16:08:27 +01:00
Laserlicht
62c3c485c9
show also z coordinate in tooltip
2025-11-16 13:48:06 +01:00
Laserlicht
4c0b652320
add teleport cheat
2025-11-16 13:47:27 +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
Laserlicht
2c729c32d4
fix romanian encoding
2025-11-14 20:55:26 +01:00
Laserlicht
0aabc0947d
fix segfault edge case in CObjectListWindow
2025-11-14 20:21:04 +01:00
Andrej Dudenhefner
497995c11f
add BattleEnded pack which happens after BattleResultsApplied and losing heroes are removed
2025-11-14 12:48:46 +01:00
Michał Zaremba
c4893baf79
Fix word wrap
2025-11-14 11:08:27 +01:00
Andrej Dudenhefner
e72dcce8ba
refactor logic to CBattleInfoCallback and leave UI in BattleFieldController, BattleActionsController
...
- move fromWhichHexAttack to CBattleInfoCallback
- add toWhichHexMove (unifying incoherent duplicates)
- add battleGetOccupiableHexes
- add battleCanAttackHex for spatial attack check
- add battleCanAttackUnit for non-spatial attack check
- add headDirection to Unit (removing destShiftDir from CStack)
- remove redundant game logic from selectAttackDirection
- remove redundant game logic from BattleFieldController and BattleActionsController
- fix no consideration for double-wide tail attack in BattleFlowProcessor
- fix #6302 wrong moat stopping condition
- throw exception on attacker nullptr in battleCanAttackHex, fromWhichHexAttack
- safer actionIsLegal on attack, move
- remove redundant canStackMoveHere from ui code
- throw exception on nullptr unit in battleGetOccupiableHexes
- ensure activeStack in redrawBackgroundWithHexes
- test point validity in selectAttackDirection
2025-11-13 09:15:56 +01:00
Laserlicht
54bc5c96df
code review: big lambdas to function & simplify sort
2025-11-12 19:59: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
