1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-07 00:58:39 +02:00
Commit Graph

1838 Commits

Author SHA1 Message Date
b159d8a028 Fixes ownership checks for creature recruitment 2023-09-05 23:12:57 +03:00
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
6a260a60cf Fix resource creation 2023-09-04 18:22:34 +03:00
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
48fb167fef Fix timer end turn while standing on obstacles/water 2023-09-02 03:27:46 +04:00
0fc6e2b316 rollback query blocking 2023-09-02 03:17:51 +04:00
00216168bf Timer works as designed 2023-08-30 03:44:09 +04:00
03496e6738 Code review fixes 2023-08-29 15:48:42 +04:00
883c68b151 Remove unused variable 2023-08-28 19:57:42 +04:00
2c61d1b23f Use precision clocks for timer 2023-08-28 19:45:15 +04:00
084122bc80 Fix compiling 2023-08-28 17:26:16 +04:00
86ab97c64f Fix stop on flight for timer 2023-08-28 17:21:38 +04:00
0bc2302f1f Fix battle timer logic 2023-08-28 17:12:08 +04:00
1586c6c6a0 Merge pull request #2668 from IvanSavenko/remove_current_player
Remove "currentPlayer" from gamestate
2023-08-28 17:10:28 +04:00
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
edd029c79c Replace "currentPlayer" from gamestate with "activePlayers"
- Allows multiple active players at once, e.g. simturns
- Cleared up validation of netpacks by server, e.g. always check for
pack sender
2023-08-25 18:56:15 +03:00
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
62cd8b12d4 Converted several namespace enums to enum class 2023-08-25 13:38:02 +03:00
17d3d663ee Converted creature ID and spell ID to new form 2023-08-25 13:38:02 +03:00
b0eec85aca Merge pull request #2632 from rilian-la-te/resist-rework-pt1
Spell resistance rework: part 1
2023-08-25 01:13:57 +03:00
97ba7df152 Fix handling of map turn/day limit 2023-08-24 23:34:33 +03:00
f9410145d6 Fix handling of "7 days without town" loss condition 2023-08-24 23:34:33 +03:00
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