ee8adbe85f
Update tavern on end of 7th turn of player in question
...
Allows removal of "retreat after 7th day" workaround and as result -
more straightforward code
2023-08-24 23:34:33 +03:00
a19cdb57ba
Fix handling of turn order in case of player defeat
2023-08-24 23:34:33 +03:00
d83aa828f6
Fix turn ending
2023-08-24 23:34:33 +03:00
c4bc6840ea
Moved management of turn order into a new class
2023-08-24 23:34:33 +03:00
db542d2710
Merge pull request #2664 from Nordsoft91/fix-ai-movement-freeze
2023-08-25 00:08:40 +04:00
596b98e1c1
Fix AI freeze regression
2023-08-24 16:42:47 +04:00
344593e891
vcmi: made some CSpell properties private
...
There are getters for it.
2023-08-23 17:53:08 +03:00
44d16b32fe
Use API identical to std classes where possible
2023-08-23 16:32:29 +03:00
1bad0e96ef
Merge pull request #2635 from Nordsoft91/loading-bar
...
Loading progress bar
2023-08-23 17:28:19 +04:00
dfaf778d16
Redesign loading solution
2023-08-22 20:10:20 +04:00
7b4b01a280
Adopt turn timer to battle refactoring
2023-08-22 01:49:50 +04:00
d50edc28ab
Merge remote-tracking branch 'upstream/develop' into turn-timer
...
# Conflicts:
# server/CGameHandler.cpp
# server/CGameHandler.h
2023-08-22 00:54:38 +04:00
dbc3a93013
Merge remote-tracking branch 'upstream/develop' into loading-bar
...
# Conflicts:
# server/CGameHandler.h
2023-08-22 00:46:54 +04:00
45f13c7964
Progress update on client side
2023-08-21 19:21:27 +04:00
584dd20943
Progress on server side for rmg
2023-08-21 19:21:22 +04:00
44832f3797
Split BattleProcessor into few more parts
2023-08-21 17:55:49 +03:00
323772fc2e
Split CQuery file into multiple files
2023-08-21 17:55:07 +03:00
629ca3f13e
Created directory structure for server files
2023-08-21 17:55:07 +03:00
c217d7717a
server queries is now stored as unique_ptr
2023-08-21 17:55:07 +03:00
e8e6c02a4a
Moved all battle-related functionality of server into a new class
2023-08-21 17:55:06 +03:00
d0b3319f6a
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-18 15:08:23 +03:00
daa8a494fc
Merge branch 'release_131' into master
2023-08-17 16:19:20 +03:00
00ac8eb306
Attempt to fix crash on quitApplication on Android
2023-08-15 00:17:59 +03:00
d26fdaefe4
Battle timer
2023-08-14 23:31:44 +04:00
23aaa72dfe
No error on hero move when timer is expired
2023-08-14 05:21:57 +04:00
a8e5b32b6a
Fix compiling
2023-08-14 04:55:45 +04:00
380ee41fba
Fix finishing turn while flying over object
2023-08-14 04:33:41 +04:00
e414af221b
Move turn timer logic from GameHandler class
2023-08-14 03:20:27 +04:00
3c9c302fd2
TurnTimerInfo
2023-08-14 02:16:25 +04:00
4b1224ec8c
Implement turn timer feature
2023-08-13 14:07:48 +04:00
f13a53c1d9
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-12 17:28:47 +03:00
92ce97bbc7
Merge remote-tracking branch 'vcmi/master' into beta
2023-08-12 16:20:06 +03:00
8cbc52364a
Merge pull request #2496 from IvanSavenko/saves_in_mods
...
Allowed loading saves from inside mods
2023-08-12 11:27:15 +03:00
4b307dc0e4
More locks to avoid data races on server
2023-08-11 18:50:39 +03:00
d7cbe4ecde
Attempt to fix data raced in battle on server
2023-08-07 17:28:21 +03:00
9bd27c50a0
Allowed loading saves from inside mods
2023-08-06 19:39:55 +03:00
6e7a02702d
Fix crash in naval combat
2023-08-04 10:46:04 +03:00
537f9fa048
Merged master into develop
2023-08-03 23:38:32 +03:00
62fddca21e
Split massive CModHandler class/file into multiple parts:
...
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
943e3e888c
Merge remote-tracking branch 'origin/beta' into fix-freeze-ai-attacking-dwelling
...
# Conflicts:
# server/CGameHandler.cpp
2023-07-29 08:11:27 +02:00
8e1dc785eb
Wrong player was engaged for 5lvl dwelling
2023-07-28 14:19:12 +03:00
aed8c411fc
Minor rework & cleanup of combat replays
2023-07-27 19:25:55 +03:00
e733b55c90
Removed buggy and poorly designed fromString method
...
Use VLC->modh directly with proper parameters instead
2023-07-25 22:36:45 +03:00
705cdb846d
Merge pull request #2403 from IvanSavenko/error_detection_fix
...
Attempt to fix & improve error reporting
2023-07-25 18:15:28 +03:00
ec8898a0e7
#1965 - treat dwelling defenders as neutrals
2023-07-25 10:13:41 +03:00
21e794268b
Attempt to fix & improve error detection:
...
- use std::fstream instead of boost::iostreams for properly working flush
- removed some catch-all blocks
- reduce catch scope of some try/catch blocks to clearly indicate intent
2023-07-24 18:48:56 +03:00
280085b95d
Merge pull request #2308 from IvanSavenko/remove_client_savegame
...
Remove client savegames
2023-07-19 14:46:46 +03:00
baa865d857
Extracted message-related functionality of CGameHandler to separate file
2023-07-15 21:01:13 +03:00
ec7e046617
Fix hero pool persistency between saves
2023-07-15 19:55:30 +03:00
19ace6a849
Moved hero pool logic to the separate files
2023-07-15 19:55:29 +03:00
