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
36f2794857
Merge pull request #6341 from kdmcser/spell_like_attack
...
fix limiter is invalid in SPELL_LIKE_ATTACK bonus
2025-11-23 18:40:33 +02:00
kdmcser
4222f7e01f
fix limiter is invalid in SPELL_LIKE_ATTACK bonus
2025-11-23 19:04:26 +08:00
Laserlicht
afb045ef14
show statistics ingame
2025-11-22 16:46:10 +01:00
Mircea TheHonestCTO
5c6f2faebb
Merge branch 'develop' into feature/nullkiller2
2025-11-19 17:47:18 +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
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
Mircea TheHonestCTO
0ee10c9213
Merge branch 'develop' into feature/nullkiller2
2025-11-15 17:15:46 +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
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
Mircea TheHonestCTO
00c93c7b6a
Merge branch 'develop' into feature/nullkiller2
2025-10-28 22:30:39 +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
Mircea TheHonestCTO
8a9b83bb14
Merge branch 'develop' into feature/nullkiller2
2025-10-19 21:17:45 +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
Mircea TheHonestCTO
31cd821066
Merge branch 'develop' into feature/nullkiller2
2025-10-15 11:59:08 +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
Mircea TheHonestCTO
d43accfd95
Merge branch 'develop' into feature/nullkiller2
2025-10-01 17:56:58 +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
Mircea TheHonestCTO
5c19f0aa7a
fix: cannot open saved games with extra dots in the name
2025-09-21 17:48:46 +02: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