1670 Commits

Author	SHA1	Message	Date
Ivan Savenko	b21a361b99	Merge pull request #2814 from SoundSSGood/arts-counter-impovements ... Artifacts counter impovements	2023-10-01 17:53:51 +03:00
nordsoft	00c8c2eb82	Event message meta string	2023-09-27 23:28:17 +02:00
Ivan Savenko	16424d2fc0	Fixed boat boarding	2023-09-27 21:25:04 +03:00
Ivan Savenko	97097c20ad	Merge pull request #2874 from SoundSSGood/exchange-window-update ... Exchange window update	2023-09-27 15:50:52 +03:00
Ivan Savenko	94dbde05a0	Merge pull request #2868 from IvanSavenko/simultaneous_turns ... Simultaneous turns	2023-09-27 15:45:02 +03:00
Nordsoft91	c803b57c33	Merge pull request #2889 from Nordsoft91/mod-compatibility-check ... Proper mod compatibility check logic	2023-09-26 19:29:46 +02:00
Ivan Savenko	0a0c01d639	Replaced 'isVisitActiveFor' methods with single 'getVisitingHero'	2023-09-26 15:55:07 +03:00
Ivan Savenko	3ea807fb8d	Fixed movement through teleporters by AI	2023-09-26 13:42:20 +03:00
Ivan Savenko	623fb2a63e	Do not allow visiting objects blocked by visit of another player	2023-09-26 13:42:20 +03:00
Ivan Savenko	b807c3855b	Add proper visitation checks for netpacks	2023-09-26 13:42:20 +03:00
Ivan Savenko	d257fb37f0	Use optional instead of Json for queries	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
nordsoft	dce1ac1538	Redesign mod incompatibility message	2023-09-23 00:32:48 +02: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
SoundSSGood	48ec2d7e2a	Merge branch 'vcmi:develop' into exchange-window-update	2023-09-19 16:22:00 +03:00
SoundSSGood	a83f290e13	bulk move artifacts only equipped, only backpack	2023-09-19 13:31:42 +03:00
Ivan Savenko	f1c40466d3	Changes according to review	2023-09-18 18:17:26 +03:00
Ivan Savenko	b7de685483	Fixed paths through teleport, formatting cleanup	2023-09-16 20:35:04 +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
SoundSSGood	89409da0c0	Reduced number of assembling asks	2023-09-12 19:17:37 +03:00
SoundSSGood	82eb2f8a2b	Artifact assembling changes	2023-09-12 19:17:35 +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	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +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
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	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	00216168bf	Timer works as designed	2023-08-30 03:44:09 +04:00
nordsoft	03496e6738	Code review fixes	2023-08-29 15:48:42 +04:00
nordsoft	883c68b151	Remove unused variable	2023-08-28 19:57:42 +04:00
nordsoft	2c61d1b23f	Use precision clocks for timer	2023-08-28 19:45:15 +04:00
nordsoft	084122bc80	Fix compiling	2023-08-28 17:26:16 +04:00
nordsoft	86ab97c64f	Fix stop on flight for timer	2023-08-28 17:21:38 +04:00
nordsoft	0bc2302f1f	Fix battle timer logic	2023-08-28 17:12:08 +04:00
Nordsoft91	1586c6c6a0	Merge pull request #2668 from IvanSavenko/remove_current_player ... Remove "currentPlayer" from gamestate	2023-08-28 17:10:28 +04:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Ivan Savenko	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
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	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
Ivan Savenko	97ba7df152	Fix handling of map turn/day limit	2023-08-24 23:34:33 +03:00
Ivan Savenko	f9410145d6	Fix handling of "7 days without town" loss condition	2023-08-24 23:34:33 +03:00
Ivan Savenko	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
Ivan Savenko	a19cdb57ba	Fix handling of turn order in case of player defeat	2023-08-24 23:34:33 +03:00
Ivan Savenko	d83aa828f6	Fix turn ending	2023-08-24 23:34:33 +03:00
Ivan Savenko	c4bc6840ea	Moved management of turn order into a new class	2023-08-24 23:34:33 +03:00
Nordsoft91	db542d2710	Merge pull request #2664 from Nordsoft91/fix-ai-movement-freeze	2023-08-25 00:08:40 +04:00
nordsoft	596b98e1c1	Fix AI freeze regression	2023-08-24 16:42:47 +04:00
Konstantin	344593e891	vcmi: made some CSpell properties private ... There are getters for it.	2023-08-23 17:53:08 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
nordsoft	dfaf778d16	Redesign loading solution	2023-08-22 20:10:20 +04:00
nordsoft	7b4b01a280	Adopt turn timer to battle refactoring	2023-08-22 01:49:50 +04:00
nordsoft	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
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00
nordsoft	45f13c7964	Progress update on client side	2023-08-21 19:21:27 +04:00
nordsoft	584dd20943	Progress on server side for rmg	2023-08-21 19:21:22 +04:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Ivan Savenko	323772fc2e	Split CQuery file into multiple files	2023-08-21 17:55:07 +03:00
Ivan Savenko	629ca3f13e	Created directory structure for server files	2023-08-21 17:55:07 +03:00
Ivan Savenko	c217d7717a	server queries is now stored as unique_ptr	2023-08-21 17:55:07 +03:00
Ivan Savenko	e8e6c02a4a	Moved all battle-related functionality of server into a new class	2023-08-21 17:55:06 +03:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Ivan Savenko	daa8a494fc	Merge branch 'release_131' into master	2023-08-17 16:19:20 +03:00
Ivan Savenko	00ac8eb306	Attempt to fix crash on quitApplication on Android	2023-08-15 00:17:59 +03:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
nordsoft	23aaa72dfe	No error on hero move when timer is expired	2023-08-14 05:21:57 +04:00
nordsoft	a8e5b32b6a	Fix compiling	2023-08-14 04:55:45 +04:00
nordsoft	380ee41fba	Fix finishing turn while flying over object	2023-08-14 04:33:41 +04:00
nordsoft	e414af221b	Move turn timer logic from GameHandler class	2023-08-14 03:20:27 +04:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Ivan Savenko	8cbc52364a	Merge pull request #2496 from IvanSavenko/saves_in_mods ... Allowed loading saves from inside mods	2023-08-12 11:27:15 +03:00
Ivan Savenko	4b307dc0e4	More locks to avoid data races on server	2023-08-11 18:50:39 +03:00
Ivan Savenko	d7cbe4ecde	Attempt to fix data raced in battle on server	2023-08-07 17:28:21 +03:00
Ivan Savenko	9bd27c50a0	Allowed loading saves from inside mods	2023-08-06 19:39:55 +03:00
Tomasz Zieliński	6e7a02702d	Fix crash in naval combat	2023-08-04 10:46:04 +03:00
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Ivan Savenko	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
Tomasz Zieliński	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
Andrii Danylchenko	8e1dc785eb	Wrong player was engaged for 5lvl dwelling	2023-07-28 14:19:12 +03:00
Ivan Savenko	aed8c411fc	Minor rework & cleanup of combat replays	2023-07-27 19:25:55 +03:00
Ivan Savenko	e733b55c90	Removed buggy and poorly designed fromString method ... Use VLC->modh directly with proper parameters instead	2023-07-25 22:36:45 +03:00
Ivan Savenko	705cdb846d	Merge pull request #2403 from IvanSavenko/error_detection_fix ... Attempt to fix & improve error reporting	2023-07-25 18:15:28 +03:00
Andrii Danylchenko	ec8898a0e7	#1965 - treat dwelling defenders as neutrals	2023-07-25 10:13:41 +03:00
Ivan Savenko	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
Ivan Savenko	280085b95d	Merge pull request #2308 from IvanSavenko/remove_client_savegame ... Remove client savegames	2023-07-19 14:46:46 +03:00
Ivan Savenko	baa865d857	Extracted message-related functionality of CGameHandler to separate file	2023-07-15 21:01:13 +03:00
Ivan Savenko	ec7e046617	Fix hero pool persistency between saves	2023-07-15 19:55:30 +03:00
Ivan Savenko	19ace6a849	Moved hero pool logic to the separate files	2023-07-15 19:55:29 +03:00
Dydzio	afb9bfc180	Revert apparently broken changes from commits 96420bf, 92dcfd1, c4cf2a1	2023-07-11 21:22:24 +02:00
Ivan Savenko	9acab48bc3	Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework ... CArtifact CArtifactInstance refactoring	2023-07-11 14:36:08 +03:00
Ivan Savenko	8750aa2c5b	Merged server savegame and (broken and unused) client savegame files	2023-07-09 15:30:47 +03:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
SoundSSGood	fd9c7352a0	suggested changes	2023-07-03 22:54:03 +03:00
Ivan Savenko	48eb8ab54f	Play sound when receiving message, not just on sending ours	2023-07-03 17:12:31 +03:00
SoundSSGood	670999d40e	BattleResultAccepted fixed	2023-07-01 14:59:16 +03:00
SoundSSGood	060aecc61c	CArtifact refactoring	2023-06-30 19:41:26 +03:00
SoundSSGood	07c811dd67	CCombinedArtifactInstance refactoring	2023-06-30 19:40:57 +03:00
Ivan Savenko	8420a90aa4	Reorganization of campaigns code	2023-06-26 17:15:59 +03:00
Ivan Savenko	85262cf4f5	Moved CGameState files into a separate directory	2023-06-26 17:15:59 +03:00
Ivan Savenko	08cfbe79cf	Added encapsulation for movement points access	2023-06-25 17:42:36 +03:00
Ivan Savenko	f7b27da00e	Implemented support for "coast visitable" objects: ... - objects marked as coast visitable can be visited from land even when placed in water - added isBlockedVisitable and isCoastVisitable method to CGObjectInstance - implemented json config for these properties in banks	2023-06-25 17:42:33 +03:00
Ivan Savenko	ce3e150d59	Minor formatting	2023-06-23 13:55:52 +03:00
Ivan Savenko	6a08a96d0c	Added createObject call as wrapper around NewObject netpack	2023-06-23 13:42:08 +03:00
Ivan Savenko	d8879f1e53	NewObject pack now receives visitable position instead of h3m position	2023-06-23 13:34:51 +03:00
Ivan Savenko	69dc95c3c8	Merge pull request #2235 from IvanSavenko/hota_h3m_support ... Hota h3m support	2023-06-23 13:32:10 +03:00
Ivan Savenko	bd4d2788ed	Split pathfinder into multiple smaller files	2023-06-21 13:46:09 +03:00
Ivan Savenko	87fcfa4add	Removed excessive pathfinder includes	2023-06-21 12:00:44 +03:00
Ivan Savenko	3913b8e98c	Heroes placed on water in map will be automatically given boat	2023-06-20 19:37:27 +03:00
Ivan Savenko	a84666edf6	MetaString can be serialized in json	2023-06-20 19:37:27 +03:00
Ivan Savenko	d51fe62804	Win/loss condition texts use MetaString	2023-06-20 19:37:27 +03:00
Ivan Savenko	56d69e790b	Renamed MetaString methods to more logical names	2023-06-20 19:37:27 +03:00
Ivan Savenko	f35b3a0dc3	Replace MetaString operator << with member function	2023-06-20 19:37:27 +03:00
Ivan Savenko	6ed0fbe579	Fix excessive warning - neutral town with Portal is perfectly legal	2023-06-20 19:37:27 +03:00
Ivan Savenko	ece9982ca0	Fix build	2023-06-16 18:11:45 +03:00
Ivan Savenko	6aedb99117	Cleaned up IShipyard interface	2023-06-16 17:59:10 +03:00
Tomasz Zieliński	adec58f5bf	- Set fixed boat type for Tavern / Prison ... - Move magical boat offset to static function	2023-06-15 17:53:18 +02:00
Tomasz Zieliński	351d596bdc	Handle water Prisons and Taverns.	2023-06-08 09:17:08 +02:00
Tomasz Zieliński	db917ae435	Fix #1140	2023-06-07 17:29:07 +02:00
Ivan Savenko	1e9eea30e1	Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop	2023-06-05 18:53:17 +03:00
Michael	70bdec41a3	case-insensitive cheats	2023-05-20 01:14:06 +02:00
SoundSSGood	021f94a579	artifact utils	2023-05-17 17:00:31 +03:00
SoundSSGood	a10279e1cc	Grail fix	2023-05-16 16:51:45 +03:00
Ivan Savenko	79982c4ad4	Fix broken bonuses due to calling PutArtifact before NewArtifact	2023-05-09 16:48:52 +03:00
nordsoft	ce80c83ca2	Merge remote-tracking branch 'upstream/develop' into town-buildings ... # Conflicts: # lib/CTownHandler.cpp # lib/rewardable/Interface.cpp	2023-05-04 22:23:44 +04:00
Konstantin	05eccbc2bb	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
nordsoft	92dcfd1f68	Fix garrisons hero	2023-05-02 15:09:02 +04:00
nordsoft	96420bfc05	Fix configurable reward for non-query scenrio	2023-05-02 14:45:42 +04:00
Konstantin	fbc05c70ac	vcmi: camelCase methods of new classes ... Also use EGameSettings for clamping morale and luck	2023-05-02 12:09:13 +03:00
Konstantin	a6de9097be	vcmi: rename HeroBonus.h to Bonus.h	2023-05-02 11:20:58 +03:00
nordsoft	c4cf2a100b	Fix behavior for hero bought in town tavern	2023-05-02 04:44:09 +04:00
Ivan Savenko	916b41d9a7	Merge pull request #2078 from IvanSavenko/shortcuts ... Basic shortcuts system	2023-05-01 21:45:52 +03:00
nordsoft	59bc9326e9	Remove excess pointer from market interface	2023-05-01 21:49:37 +04:00
Ivan Savenko	a654cc2391	Removed vstd::advance. Added vstd::next to handle similar cases.	2023-05-01 17:58:18 +03:00