1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

1986 Commits

Author SHA1 Message Date
Ivan Savenko
541f7590c5 Add simple detection of player-player contact 2023-09-26 13:42:20 +03:00
Ivan Savenko
64c43c91dc Added hardcoded min/max simturns duration 2023-09-26 13:42:20 +03:00
Ivan Savenko
b2f30f78fa Allow one AI and human to act simultaneously 2023-09-26 13:42:20 +03:00
Nordsoft91
a36450e2d1
Merge pull request #2882 from Nordsoft91/ai-cheating
Add basic system to give more advantages for ai player
2023-09-23 03:21:19 +02:00
nordsoft
099109b7d2 Minor fixes 2023-09-22 00:52:19 +02:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
Changes for simturns support
2023-09-20 22:09:25 +03:00
nordsoft
0de912e67b Add basic system to add more advantages for ai player 2023-09-20 03:50:35 +02:00
Ivan Savenko
7b37c2353a
Merge pull request #2865 from IvanSavenko/market_ownership_check_fix
Cleaned up and fixed ownership checks for market netpack
2023-09-19 23:43:33 +03:00
Ivan Savenko
8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
Ivan Savenko
3cdc3daa2c Fix crash on handling invalid player request 2023-09-19 19:21:23 +03:00
Ivan Savenko
219f81d28b Added explicit "PlayerEndsTurn" netpack
- PlayerEndsTurn pack is now sent when player ends turn
- YourTurn pack has been renamed to PlayerStartsTurn for consistency
- PlayerStartsTurn will no longer replace list of acting players
- PlayerEndsGame and PlayerEndsTurn will remove player from acting list
2023-09-18 20:55:01 +03:00
Ivan Savenko
f1c40466d3 Changes according to review 2023-09-18 18:17:26 +03:00
Ivan Savenko
3d04e9c9ed Cleaned up and fixed ownership checks for market netpack 2023-09-18 17:22:30 +03:00
Ivan Savenko
b7de685483 Fixed paths through teleport, formatting cleanup 2023-09-16 20:35:04 +03:00
Ivan Savenko
c8e6a7cd27 Fixed most common cases of movement actions 2023-09-16 20:07:26 +03:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Dydzio
e79c707cf7 Fix wrong condition 2023-09-14 12:54:07 +02:00
Dydzio
56c969be4f Fix commanders requirements for special skills to match WoG 2023-09-13 23:08:22 +02:00
Dydzio
6435217a8c Quick-fix for transmutation skill - same as in SUMMON_GUARDIANS 2023-09-13 19:36:58 +02:00
Krisztián Szabó
b9b51334eb Award 500 experience for towns conquered during a battle. 2023-09-12 21:30:30 +03:00
Krisztián Szabó
cb3cc84c61 Give bonus experience for capturing a town even if the enemy hero escaped. 2023-09-11 19:51:23 +02:00
Krisztián Szabó
6a5e71aa63 Award 500 experience for towns conquered during a battle. 2023-09-11 09:37:48 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan Savenko
587be4c7d5
Merge pull request #2767 from IvanSavenko/dwelling_recruit_fix
Fixes ownership checks for creature recruitment
2023-09-07 15:09:55 +03:00
Ivan Savenko
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
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Ivan Savenko
e5719daf11 Added "vcmiartifacts angelWings" form to cheat 2023-09-06 22:44:41 +03:00
Ivan Savenko
1f1f978328 Fixed battle replay 2023-09-06 16:03:47 +03:00
Ivan Savenko
8bdddd1324 Fix tests compilation 2023-09-06 16:03:47 +03:00
Ivan Savenko
9fa7a93fb0 Properly pass battleID in all battle netpack's 2023-09-06 16:03:47 +03:00
Ivan Savenko
747e28947a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko
3a88180494 Separated game and battle callback (server & client only) 2023-09-06 16:03:39 +03:00
Ivan Savenko
fc4dfda00f Added support for concurrent battles to gamestate and server 2023-09-06 16:03:02 +03:00
Evgeniy Meshcheryakov
e9c2d4e857 Blinded stack should not be able to get morale 2023-09-06 12:40:05 +03:00
Ivan Savenko
ad25bfb4bb Fixed invisible creatures from SUMMON_GUARDIANS bonus 2023-09-06 11:29:28 +03:00
Ivan Savenko
b159d8a028 Fixes ownership checks for creature recruitment 2023-09-05 23:12:57 +03:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko
6a260a60cf Fix resource creation 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
nordsoft
e85eb36bbd Battle timer fix 2023-09-02 13:14:24 +04:00
nordsoft
48fb167fef Fix timer end turn while standing on obstacles/water 2023-09-02 03:27:46 +04:00
nordsoft
0fc6e2b316 rollback query blocking 2023-09-02 03:17:51 +04:00
nordsoft
9cd3b537ad Add turn timer allowed option 2023-09-02 03:17:32 +04:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer
Turn timer fixes
2023-09-01 00:31:52 +04:00
Ivan Savenko
0f4f9b3233 Fix handling of opening spells when tactics is present 2023-08-31 01:32:32 +03:00
nordsoft
00216168bf Timer works as designed 2023-08-30 03:44:09 +04:00
nordsoft
cc3ca9a41e Timers fixes 2023-08-30 03:33:59 +04:00
nordsoft
9a42abe2a7 Extended timer info to exhange between client and server 2023-08-30 03:11:46 +04:00
nordsoft
f30f00faa0 Timer pausing while waiting for player accept turn 2023-08-30 02:18:44 +04:00