12707 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	fd3217c875	Fix few more missing BattleID's	2023-09-11 13:20:16 +03:00
Ivan Savenko	c4e2417326	Fix crash on obstacle creation (e.g. moat)	2023-09-08 16:35:43 +03:00
Nordsoft91	24ad06b5c3	Merge pull request #2726 from Nordsoft91/launcher-size-support	2023-09-08 05:47:06 +04:00
nordsoft	bb4905af48	Change resourceID with ResourcePath	2023-09-08 01:54:29 +02:00
nordsoft	8c94d082c8	Merge remote-tracking branch 'upstream/develop' into launcher-size-support	2023-09-08 01:51:52 +02:00
Nordsoft91	43ef20efc5	Merge pull request #2748 from Nordsoft91/lobby-chat ... Advanced chat in lobby	2023-09-07 22:01:43 +04:00
nordsoft	40ea45498f	Rename	2023-09-07 19:57:57 +02: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	ba017f0e8d	Merge pull request #2749 from SoundSSGood/artifacts-related-fixes ... Artifacts related fixes	2023-09-07 13:03:52 +03:00
SoundSSGood	1b810b5b93	combined arts assembling fixed	2023-09-07 11:54:52 +03:00
SoundSSGood	f1a6116088	CHeroArea fix	2023-09-07 11:54:50 +03:00
SoundSSGood	3675d88730	fixed highlighting slots	2023-09-07 11:39:29 +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	ef0eb8e930	Merge pull request #2772 from wb180/tavernPoolHeroesFix ... Remove(reduce durations) of bonuses for tavern heroes	2023-09-07 10:54:44 +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	5f07f3f091	Merge pull request #2673 from IvanSavenko/concurrent_battles ... Concurrent battles support	2023-09-06 19:24:27 +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	ef94e7a78a	Fix build	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	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Ivan Savenko	036df2e0ad	Support multiple battles in AI	2023-09-06 16:03:46 +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	a21de70516	Merge pull request #2758 from IvanSavenko/identifiers_serialization_fix ... Fix serialization of identifers by Json Serializer	2023-09-06 15:21:54 +03:00
Evgeniy Meshcheryakov	e9c2d4e857	Blinded stack should not be able to get morale	2023-09-06 12:40:05 +03:00
Evgeniy Meshcheryakov	47f5dd14fa	Remove(reduce durations) of bonuses for tavern heroes	2023-09-06 09:12:23 +03:00
Ivan Savenko	b159d8a028	Fixes ownership checks for creature recruitment	2023-09-05 23:12:57 +03:00
Ivan Savenko	1a82280cb2	Fix build	2023-09-05 13:16:08 +03:00
Ivan Savenko	f30355839f	Fix build	2023-09-05 00:55:54 +03:00
Ivan Savenko	609f25f344	Add sanity check	2023-09-04 22:43:16 +03:00
Ivan Savenko	b6a1a8f0da	Json Serializer should now use identifers storage properly	2023-09-04 22:23:20 +03:00
Ivan Savenko	9735fa6d06	Fix regresssion - crash	2023-09-04 22:22:45 +03:00
Ivan Savenko	12c4f8d18c	Fixed serialization of PlayerColor in json	2023-09-04 22:22:24 +03:00
Ivan Savenko	86a7f5f5cd	Removed getStr(bool), replaced with similar toString()	2023-09-04 22:21:02 +03:00
Ivan Savenko	7e27ac7073	IdentifierStorage is now separate handler in VLC	2023-09-04 18:56:16 +03:00
Ivan Savenko	c8a6cd74cc	Additional checks for invalid access to IdentifierStorage	2023-09-04 18:56:16 +03:00
Ivan Savenko	82989e6302	Use pointers in containers to guaranteed fixed address	2023-09-04 18:56:16 +03:00
Ivan Savenko	a30e7ba321	Remove bitmasks of PlayerColor's. Add encode/decode methods	2023-09-04 18:56:16 +03:00
Ivan Savenko	1d0e696db6	Added RenderHandler that acts as factory for images and animations	2023-09-04 18:22:34 +03:00
Ivan Savenko	3f921fa771	Serialization version bump	2023-09-04 18:22:34 +03:00
Ivan Savenko	6a260a60cf	Fix resource creation	2023-09-04 18:22:34 +03:00
Ivan Savenko	9cfcf5ea19	Fix regressions	2023-09-04 18:22:34 +03:00
Ivan Savenko	0f88b8969b	Removed some usages of std string as resource path	2023-09-04 18:22:34 +03:00
Ivan Savenko	8dfdfffd87	Use ResourcePath for audio files	2023-09-04 18:22:34 +03:00
Ivan Savenko	97b7d44c88	Use ResourcePath for video accessing	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
Ivan Savenko	f79492e5b0	Merge pull request #2755 from wb180/fixNKAICompilation ... Fix NKAI compilation with NKAI_PATHFINDER_TRACE_LEVEL>=2	2023-09-04 15:29:44 +03:00