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

7680 Commits

Author SHA1 Message Date
Mircea TheHonestCTO
0ee10c9213 Merge branch 'develop' into feature/nullkiller2 2025-11-15 17:15: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
2070c68f76 fix text overflow in hero overview 2025-11-09 14:15:06 +01:00
Laserlicht
365f87ed3e add haptics to spellbook 2025-11-09 00:06:02 +01:00
Ivan Savenko
7cabae89e3 Merge pull request #6243 from Laserlicht/battleonly
Battleonly mode
2025-11-06 14:33:44 +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
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
01fb25e096 Merge pull request #6284 from GeorgeK1ng/commander_button
Fix commander abilities button position
2025-11-04 15:55:51 +02:00
George King
5c16e25a7e Update CCreatureWindow.cpp 2025-11-02 22:17:26 +01:00
Laserlicht
743013a0d6 Merge branch 'develop' into battleonly 2025-11-02 20:31:28 +01:00
Ivan Savenko
f4c65fe271 Show "all spells" icon in Mages Guild when Aurora Borealis is present 2025-11-02 11:39:12 +02:00
Ivan Savenko
34a4668998 Do not require frameAngles for ray-based animation 2025-11-01 23:20:16 +02:00
Andrej Dudenhefner
0f74cb9c79 Fix preserveCountSuffix if no parentheses are present 2025-11-01 15:35:26 +01:00
Mircea TheHonestCTO
00c93c7b6a Merge branch 'develop' into feature/nullkiller2 2025-10-28 22:30:39 +01:00
Laserlicht
1cd550e2c4 make random list also blue & index fix 2025-10-28 15:20:26 +01:00
Laserlicht
a6ea9be489 Merge branch 'develop' into battleonly 2025-10-28 14:42:27 +01:00
Laserlicht
b218542d51 code review 2025-10-28 14:39:14 +01:00
Ivan Savenko
dc9fd90f3e Merge pull request #6211 from Laserlicht/text_edit
Allowing editing town name
2025-10-28 15:33:50 +02:00
Ivan Savenko
185c41810f Merge pull request #6216 from Laserlicht/tpl_search
template search
2025-10-28 14:26:29 +02:00
Laserlicht
ea001c6973 fix regression of #6255 2025-10-28 12:39:28 +01:00
Laserlicht
c202d44179 Merge branch 'develop' into battleonly 2025-10-28 12:26:57 +01:00
Ivan Savenko
483e170f6b Fix text trimming in object window
- Do not attempt to preserve object count in string when string does not
contains object count
- Correctly look up last bracket, to correctly handle object names that
contain brackets
2025-10-27 19:33:48 +02:00
Laserlicht
8bb789ec56 cleanup 2025-10-26 01:04:49 +02:00
Laserlicht
48e2d43c97 colorize & bugfix 2025-10-26 01:02:51 +02:00
Laserlicht
50db54393d ui fixes 2025-10-25 23:28:17 +02:00
Laserlicht
189acf9be4 refactor types 2025-10-25 23:08:08 +02:00
Laserlicht
05ea43438e ui update 2025-10-25 21:44:13 +02:00
Laserlicht
66f377f14e netpackages 2025-10-25 20:41:39 +02:00
Laserlicht
678d8275b7 block ui for guest 2025-10-25 19:32:56 +02:00
Laserlicht
fcdc100761 introduce BattleOnlyModeStartInfo for multiplayer 2025-10-25 19:06:28 +02:00
Laserlicht
134017a7cd basic multiplayer support 2025-10-25 17:55:25 +02:00
Laserlicht
c6730a2dcc text edit slotid directly now 2025-10-25 17:12:55 +02:00
Laserlicht
da2b565225 code review 2025-10-25 13:21:58 +02:00
Laserlicht
34ddc9343d (hopefully) fix android background 2025-10-25 03:12:04 +02:00
Laserlicht
c71e671aab new layout 2025-10-25 02:46:34 +02:00
Laserlicht
8a1062b9cd fix 2025-10-24 23:30:05 +02:00
Ivan Savenko
f08c6dc556 Merge pull request #6237 from MichalZr6/missing_callback_fix
Fix crash on `/translate` ChatCommand
2025-10-24 09:20:19 +03:00
Ivan Savenko
0a4bfcc3c9 Merge pull request #6226 from Laserlicht/showinvisible
show invisible
2025-10-24 09:19:45 +03:00
Laserlicht
35b294611c fix regression of #6235 2025-10-24 01:14:37 +02:00
Laserlicht
5a650a8f2f Merge branch 'develop' into battleonly 2025-10-24 01:01:42 +02:00
Laserlicht
15a85c2c5c fix pos in list popup 2025-10-24 00:56:20 +02:00
Laserlicht
ed562e42ba battleonly gui 2025-10-24 00:56:20 +02:00
Laserlicht
104fb5b308 generate blue town portal background 2025-10-24 00:54:22 +02:00