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

7731 Commits

Author SHA1 Message Date
Ivan Savenko
1c746a840c Merge pull request #6033 from thehonestcto/feature/nullkiller2
WIP feature/nullkiller2 cloned, restructured, tested and with additional improvements
2025-11-23 20:55:24 +02:00
Ivan Savenko
a3a38d9a60 Merge pull request #6340 from Laserlicht/stat_show
show statistics ingame
2025-11-23 18:55:22 +02:00
Ivan Savenko
423c49d465 Merge pull request #6313 from Laserlicht/custom_map_size
Custom map size in RMG
2025-11-23 18:44:41 +02:00
Ivan Savenko
9ef0646aaf Merge pull request #6278 from IvanSavenko/cpp20
Migrate codebase to C++20
2025-11-23 18:42:44 +02:00
Laserlicht
afb045ef14 show statistics ingame 2025-11-22 16:46:10 +01:00
Ivan Savenko
f3fd5c05af Merge pull request #6329 from Laserlicht/graphical_fixes
Content aware sliders
2025-11-20 18:25:31 +02:00
Mircea TheHonestCTO
5c6f2faebb Merge branch 'develop' into feature/nullkiller2 2025-11-19 17:47:18 +01:00
Laserlicht
2089ab1f85 check enableUiEnhancements flag 2025-11-19 00:55:09 +01:00
Laserlicht
79637c5eea viewport aware sliders 2025-11-19 00:05:31 +01:00
Laserlicht
2571ca4aed code review 2025-11-18 21:46:03 +01:00
Ivan Savenko
2db925347e Merge pull request #6316 from mrhaandi/battle-ended
Add BattleEnded pack
2025-11-18 17:50:35 +02:00
Laserlicht
4dc2033a7e vertical align title in CObjectListWindow if there is no header icon 2025-11-18 01:11:45 +01:00
Laserlicht
81ee046cc1 Merge branch 'vcmi:develop' into custom_map_size 2025-11-18 00:51:23 +01: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
Laserlicht
cad21dd627 image from def also for ImageLocator 2025-11-17 00:15:54 +01:00
Laserlicht
62c3c485c9 show also z coordinate in tooltip 2025-11-16 13:48:06 +01:00
Mircea TheHonestCTO
0ee10c9213 Merge branch 'develop' into feature/nullkiller2 2025-11-15 17:15:46 +01:00
Laserlicht
5464140a41 checking also for height for selecting buttons 2025-11-14 20:32:06 +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
293a1a7045 fix graphical issue with non squared maps 2025-11-13 02:20:51 +01:00
Laserlicht
28204cd87b fix 2025-11-13 02:17:42 +01:00
Laserlicht
9eae52574b possiblity to set custom sizes with last button 2025-11-13 02:14:42 +01:00
Laserlicht
d0273ae0ab show amount of layers 2025-11-12 23:28:08 +01:00
Laserlicht
54bc5c96df code review: big lambdas to function & simplify sort 2025-11-12 19:59:46 +01:00
Andrej Dudenhefner
31c093baae Remove condition that a unit can always attack itself 2025-11-11 19:38:48 +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
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
Laserlicht
8fcd5be977 allow to type 0 into textbox for unit amount (that we can input numbers with 1 digit) 2025-11-09 20:40:36 +01:00
Laserlicht
dab6a11736 neutral always on bottom of list 2025-11-09 14:29:26 +01:00
Laserlicht
2070c68f76 fix text overflow in hero overview 2025-11-09 14:15:06 +01:00
Laserlicht
11fa9144a4 after hero change set secSkill and spellBook to default for hero 2025-11-09 13:58:31 +01:00
Laserlicht
8582fd7043 set skill to initial after changing hero 2025-11-09 13:40:25 +01:00
Laserlicht
07621f795c fix serialisation 2025-11-09 06:41:06 +01:00
Laserlicht
34af1433e6 remove optional and add serializer 2025-11-09 05:55:44 +01:00
Laserlicht
365f87ed3e add haptics to spellbook 2025-11-09 00:06:02 +01:00
Laserlicht
f42a56edc8 spellbook fixes 2025-11-08 23:46:56 +01:00
Laserlicht
e15b776e18 add spell managment 2025-11-08 23:10:22 +01:00
Laserlicht
7d09289e5b adjust select descriptions 2025-11-08 21:23:12 +01:00