1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

26 Commits

Author SHA1 Message Date
5cbc75d3b7 Merge remote-tracking branch 'upstream/develop' into develop 2023-10-29 13:35:37 +00:00
cc8cc11da3 server/battles/BattleFlowProcessor.cpp: Called C++ object pointer is null
Null pointers should not be dereferenced
2023-10-27 23:40:55 +00:00
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03:00
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
b394158dc9 Bonus Source ID now uses metaidentifier 2023-10-22 16:55:18 +03:00
910ad50417 Fix client & server compilation 2023-10-22 16:54:48 +03:00
8058efb3bd Fixed morale and luck chance lookup. 2023-10-13 20:43:15 +02:00
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
bef97889e9 Merge pull request #2773 from wb180/blindedStackMoraleFix
Blinded stack should not be able to get morale
2023-09-07 10:54:51 +03:00
9fa7a93fb0 Properly pass battleID in all battle netpack's 2023-09-06 16:03:47 +03:00
3a88180494 Separated game and battle callback (server & client only) 2023-09-06 16:03:39 +03:00
fc4dfda00f Added support for concurrent battles to gamestate and server 2023-09-06 16:03:02 +03:00
e9c2d4e857 Blinded stack should not be able to get morale 2023-09-06 12:40:05 +03:00
0f4f9b3233 Fix handling of opening spells when tactics is present 2023-08-31 01:32:32 +03:00
c4bc6840ea Moved management of turn order into a new class 2023-08-24 23:34:33 +03:00
fb21620c60 Fix battle timer reset after refactoring 2023-08-22 14:14:50 +04:00
7b4b01a280 Adopt turn timer to battle refactoring 2023-08-22 01:49:50 +04:00
8154e84825 Fix tactics usage 2023-08-21 17:55:49 +03:00
276c00b284 Removed excessive includes 2023-08-21 17:55:49 +03:00
67eaef3520 Fixed few more discovered regressions 2023-08-21 17:55:49 +03:00
013417fb7e Code cleanup 2023-08-21 17:55:49 +03:00
c516b5a64e Fixes for several discovered edge cases 2023-08-21 17:55:49 +03:00
a1092e0f3f Fix battle ending 2023-08-21 17:55:49 +03:00
a1d3181a98 Unified spellcasting handling with other actions 2023-08-21 17:55:49 +03:00
6297140bf5 Start of stabilization - battles now start correctly 2023-08-21 17:55:49 +03:00
44832f3797 Split BattleProcessor into few more parts 2023-08-21 17:55:49 +03:00