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

2842 Commits

Author SHA1 Message Date
Ivan Savenko
97edd4936b Merge pull request #6307 from mrhaandi/battle-refactor
Refactor batte move / attack logic
2025-11-17 20:27:03 +02:00
Laserlicht
4c0b652320 add teleport cheat 2025-11-16 13:47: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
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
7cabae89e3 Merge pull request #6243 from Laserlicht/battleonly
Battleonly mode
2025-11-06 14:33:44 +02:00
George King
6978d87a97 Make sonar happy 2025-11-06 10:07:48 +01:00
George King
b593bde66b Fix names 2025-11-03 02:06:54 +01:00
George King
97c641900a Remove space 2025-11-03 01:59:11 +01:00
George King
81b8486b00 Sort backpack artifacts in both directions 2025-11-03 01:56:41 +01:00
Laserlicht
743013a0d6 Merge branch 'develop' into battleonly 2025-11-02 20:31:28 +01:00
Ivan Savenko
bdafb47655 Do not activate Life Drain if unit is fully healed 2025-11-02 12:50:27 +02:00
Ivan Savenko
8e74797650 Remove hardcoded checks for Conflux and Inferno Grails 2025-11-01 23:20:16 +02:00
Andrej Dudenhefner
4f6a4c5053 Fix networkHandler is destroyed before networkServer leading to dangling context pointer crash 2025-11-01 12:40:10 +01:00
Laserlicht
a6ea9be489 Merge branch 'develop' into battleonly 2025-10-28 14:42:27 +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
Laserlicht
a4d840f60f code review 2025-10-28 13:30:51 +01:00
Laserlicht
c202d44179 Merge branch 'develop' into battleonly 2025-10-28 12:26:57 +01:00
Ivan Savenko
f9f4a8e9af Add workaround for crash on attempt to use town portal map object 2025-10-27 19:40:24 +02:00
Laserlicht
48e2d43c97 colorize & bugfix 2025-10-26 01:02:51 +02:00
Laserlicht
05ea43438e ui update 2025-10-25 21:44:13 +02:00
Laserlicht
134017a7cd basic multiplayer support 2025-10-25 17:55:25 +02:00
Laserlicht
5a650a8f2f Merge branch 'develop' into battleonly 2025-10-24 01:01:42 +02:00
Laserlicht
ed562e42ba battleonly gui 2025-10-24 00:56:20 +02:00
Laserlicht
4d37fe631b battle only basic implementation 2025-10-24 00:54:22 +02:00
Ivan Savenko
7db19825f9 Merge pull request #6222 from Laserlicht/showincome
Show daily income in popup
2025-10-19 08:35:58 +03:00
Michał Zaremba
3e486a779d Fix incrementing conn and player IDs 2025-10-17 16:56:01 +02:00
Michał Zaremba
35543bef7a Revert "Fix incrementing PlayerConnectionID"
This reverts commit 48a683ae49.
2025-10-17 16:56:01 +02:00
Laserlicht
850617afb0 show income 2025-10-11 22:01:40 +02:00
Laserlicht
120213509d netpacks for renaming 2025-10-05 02:46:19 +02:00
Michał Zaremba
ea261ae48f Rework handling some errors and uncought exceptions 2025-10-01 11:00:56 +02:00
Ivan Savenko
c469c6c31e Merge pull request #6136 from Laserlicht/resource
Configurable resources
2025-09-28 21:51:10 +03:00
Laserlicht
5da8a7a4dc use resolveidentifier 2025-09-28 19:17:39 +02:00
Ivan Savenko
dc8d800c4f Merge pull request #6063 from Opuszek/fix_draw_in_battle
Fixes draw in a battle
2025-09-28 18:11:09 +03:00
Laserlicht
8ef97abc7d replace hardcoded 2025-09-16 10:34:38 +02:00
Laserlicht
d808bd6412 introduce toResourceType 2025-09-15 00:08:18 +02:00
Laserlicht
a54a1f8b8d replace RESOURCE_NAMES where possible 2025-09-14 20:43:53 +02:00
Laserlicht
75f965c93a remove allresources 2025-09-14 15:29:14 +02:00
Opuszek
8390f2f871 Review fix 2025-09-08 12:43:17 +02:00
Opuszek
698fe70684 Fix battle result if a loser retreated/surrendered and the victor has no pernament unit left 2025-09-03 13:21:56 +02:00
Michał Zaremba
48a683ae49 Fix incrementing PlayerConnectionID 2025-09-02 22:37:32 +02:00
Opuszek
568fa41d72 Fix battle draw scenario 2025-09-01 17:11:44 +02:00
Michał Zaremba
44557c3558 Fix PlayerConnectionID regression 2025-08-31 05:54:03 +02:00
Ivan Savenko
9a66130c12 Merge pull request #5961 from Opuszek/rework_ballist_and_tower_target_acquisition
Rework ballist and tower target acquisition
2025-08-18 22:17:07 +03:00
Mircea TheHonestCTO
8861b8745d revert: back to 0.5% monthly monster chance 2025-08-15 16:15:16 +02:00
Mircea TheHonestCTO
39bd4a2d20 refactoring with guardingCreaturePosition 2025-08-15 00:19:51 +02:00
Mircea TheHonestCTO
423eb70e2e Merge branch 'develop' into fix/monthly-random-monsters-hiding-nearby-danger 2025-08-14 23:21:20 +02:00
Ivan Savenko
6328e4b4f8 Merge pull request #6002 from kdmcser/opening_battle_spells
Add addInfo support for OPENING_BATTLE_SPELL to set spell level
2025-08-14 11:19:53 +03:00
Opuszek
75f2b24b69 Fixes to tower rework 2025-08-13 21:58:54 +02:00
Mircea TheHonestCTO
77a8b0f8e6 fix: monthly monsters aren't linked with other map objects at creation, leaving Nullkiller unable to see the next danger after killing a monthly monster;
2 minor log trace renaming to make them easier to spot in logs when debugging
2025-08-11 21:02:27 +02:00
kdmcser
594ae27cb5 support setting spell master level in OPENING_BATTLE_SPELLS 2025-08-11 02:13:36 +08:00