5764 Commits

Author	SHA1	Message	Date
Ivan Savenko	c8a96647c3	Add turn limit option to pathfinder	2023-09-26 13:42:20 +03:00
nordsoft	2a3e371caf	Remove any modification of enabled mods during game loading	2023-09-24 23:34:46 +02:00
Laserlicht	e93a04409e	Revert "another approach" ... This reverts commit 2f64457a9a.	2023-09-24 15:02:59 +02:00
Laserlicht	2f64457a9a	another approach	2023-09-24 12:54:35 +02:00
Laserlicht	fccecf023b	no invalid json	2023-09-24 01:30:03 +02:00
Laserlicht	f3e1943aaf	Merge branch 'develop' into highscore_menu	2023-09-23 21:38:17 +02:00
Laserlicht	6f8b62d77d	codereview	2023-09-23 20:41:30 +02:00
Laserlicht	a4769782c5	correct format	2023-09-23 19:01:18 +02:00
Nordsoft91	1f2ca138dd	Merge pull request #2919 from Nordsoft91/fix-2893	2023-09-23 18:02:33 +02:00
Laserlicht	455ead7b4a	fix datetime format (android)	2023-09-23 17:27:00 +02: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	a5492b30c3	Add pre-battle message	2023-09-23 02:35:21 +02:00
nordsoft	61141a0406	Fix gcc compiling	2023-09-23 01:10:45 +02:00
nordsoft	dce1ac1538	Redesign mod incompatibility message	2023-09-23 00:32:48 +02:00
Laserlicht	b0e5a11e62	fix win build	2023-09-22 22:09:01 +02:00
Ivan Savenko	455c13164e	Merge pull request #2886 from IvanSavenko/h3m_parser_fixes ... H3m parser fixes	2023-09-22 18:53:51 +03:00
nordsoft	5b24fe289b	Assembling difficulty json instead of overriding	2023-09-22 14:46:43 +02:00
nordsoft	2a2f0a657e	Fix battle bonuses serialization	2023-09-22 13:34:00 +02:00
Laserlicht	92b0e2b400	initial highscore support	2023-09-22 01:39:35 +02:00
nordsoft	16b147d588	Fix negative spell cost	2023-09-22 01:12:10 +02:00
Nordsoft91	ec582328b4	Merge pull request #2887 from Laserlicht/campaign_improvement ... campaign improvements	2023-09-22 01:01:59 +02:00
nordsoft	099109b7d2	Minor fixes	2023-09-22 00:52:19 +02:00
Laserlicht	9e78f9c69c	CodeReview	2023-09-21 23:41:00 +02:00
nordsoft	60eef59bc9	Show root mods for maps	2023-09-21 22:38:01 +02:00
nordsoft	4691907f9c	Show root mods only	2023-09-21 22:28:29 +02:00
Laserlicht	5fd2eee3e8	code review	2023-09-21 21:27:06 +02:00
nordsoft	a05f8339ae	Proper mod compatibility check system	2023-09-21 04:31:08 +02:00
Laserlicht	dfb5ccbeaf	add persistent storage & completed campaign support	2023-09-20 22:18:53 +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
Ivan Savenko	3f35ed000c	Fixed parsing of some user-made H3M maps	2023-09-20 22:00:03 +03:00
Ivan Savenko	02dfecd38b	Fixed hota maps templates loading	2023-09-20 21:59:16 +03:00
Ivan Savenko	921569e02e	Fixed "Long Live the King", 1st scenario victory condition	2023-09-20 21:58:47 +03:00
nordsoft	cb3bbc6680	Restructured difficulty config	2023-09-20 16:12:26 +02:00
nordsoft	0de912e67b	Add basic system to add more advantages for ai player	2023-09-20 03:50:35 +02:00
Laserlicht	34182069f5	campaignset	2023-09-20 03:13:54 +02:00
Nordsoft91	648e8c7acb	Merge pull request #2856 from Laserlicht/hero_overview ... Hero overview	2023-09-19 19:36:19 +02:00
Ivan Savenko	8c0d78f1d9	Added initiator-player to packs that add/remove/move objects	2023-09-19 19:24:34 +03:00
Nordsoft91	807f308c91	Merge pull request #2844 from Nordsoft91/rewardable-quests ... New rewardable interface for SeerHuts and pandoras	2023-09-19 17:59:24 +02:00
nordsoft	326791886d	Rename and events modal mode always	2023-09-19 17:11:03 +02:00
SoundSSGood	48ec2d7e2a	Merge branch 'vcmi:develop' into exchange-window-update	2023-09-19 16:22:00 +03:00
SoundSSGood	6280e778dc	fix build	2023-09-19 16:04:37 +03:00
SoundSSGood	f47def3588	refactoring	2023-09-19 13:31:57 +03:00
SoundSSGood	a83f290e13	bulk move artifacts only equipped, only backpack	2023-09-19 13:31:42 +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
nordsoft	2960895041	Issues fixed	2023-09-17 22:19:45 +02:00
Laserlicht	21f37cfafb	simplified	2023-09-17 21:41:55 +02:00
Laserlicht	05fad115b5	Added new Widgets an functions for simplification	2023-09-17 20:34:31 +02:00
nordsoft	a517e6ad8e	Message split for pandora box	2023-09-17 18:02:24 +02:00
nordsoft	e3538f24ab	Fix components problem	2023-09-17 16:04:34 +02:00
nordsoft	44d72dce51	Use enum in h3m map parser	2023-09-17 15:06:49 +02:00
nordsoft	7b22aefb12	Some minor fixes	2023-09-17 13:03:42 +02:00
Ivan Savenko	c8e6a7cd27	Fixed most common cases of movement actions	2023-09-16 20:07:26 +03:00
Ivan Savenko	80b80a0ae6	Minor cleanup of hero movemen code	2023-09-16 20:07:26 +03:00
Andrii Danylchenko	903be33bf3	#2689 - fix approaching guards when closest tile is double-guarded	2023-09-16 17:47:34 +03:00
nordsoft	a3b60bf829	Fix warning	2023-09-16 14:30:25 +02:00
nordsoft	4f76eb3fce	Add limiter serialization	2023-09-15 23:00:33 +02:00
nordsoft	4af2d917c0	Fix messages for pandoras	2023-09-15 21:13:07 +02:00
nordsoft	b5b5d881c4	Merge remote-tracking branch 'upstream/develop' into rewardable-quests	2023-09-15 21:08:22 +02:00
nordsoft	68c61797f8	Implement select all option for rewardable objects	2023-09-15 21:08:14 +02:00
nordsoft	c1c13cfafb	Pandora and events work as rewardable object	2023-09-15 15:29:41 +02:00
Laserlicht	1c68937d95	new approach	2023-09-15 15:26:14 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
nordsoft	06f01c3b82	Seerhut works as rewardable object	2023-09-15 10:06:06 +02:00
Dydzio	56c969be4f	Fix commanders requirements for special skills to match WoG	2023-09-13 23:08:22 +02:00
Ivan Savenko	248afa523d	Merge pull request #2823 from dydzio0614/pathfinder-tile-cost ... Fix pathfinder tile cost	2023-09-13 22:50:04 +03:00
Ivan Savenko	4d9cca36c6	Merge pull request #2811 from IvanSavenko/update_modding_docs ... Update modding documentation	2023-09-13 22:07:29 +03:00
Ivan Savenko	c6588e0bd1	Updated schemas & docs for several game entities	2023-09-13 21:55:36 +03:00
Dydzio	9399bcc15d	Fix pathfinder tile cost	2023-09-13 18:54:08 +02:00
Konstantin P	1522ed85e2	vcmi: make "noneOf" selector more restrictive ... It should do "or-not" instead of "and-not".	2023-09-13 17:09:59 +03:00
nordsoft	574047c55c	Start making new serialization for rewardables	2023-09-13 09:18:46 +02:00
nordsoft	96d6a48f01	Backward compatible json serialization	2023-09-13 02:14:35 +02:00
nordsoft	ef3f0174dd	Rewardable seer hut and quest gate	2023-09-13 01:40:07 +02:00
Ivan Savenko	935a18f077	Use error messages from H3	2023-09-12 21:34:58 +03:00
Ivan Savenko	e4aa981925	Add more logging to mod downloading process	2023-09-12 21:15:14 +03:00
SoundSSGood	82eb2f8a2b	Artifact assembling changes	2023-09-12 19:17:35 +03:00
Ivan Savenko	9ae7f53d66	Merge pull request #2791 from Nordsoft91/fix-2790 ... Fix for random dwellings	2023-09-12 12:38:55 +03:00
nordsoft	a89a8019ab	Added skills customization	2023-09-11 20:37:25 +02:00
Nordsoft91	96433436dd	Merge pull request #2782 from Nordsoft91/editor-improvements-1.4 ... Map editor: events, rumors	2023-09-11 20:36:13 +02:00
Nordsoft91	a18aa2cf7e	Merge pull request #2802 from Laserlicht/voice_camp ... Voice for campaigns	2023-09-11 18:15:23 +02:00
Ivan Savenko	f13f213d8c	Merge pull request #2780 from IvanSavenko/fix_siege_regression ... Fix crash on obstacle creation (e.g. moat)	2023-09-11 15:56:33 +03:00
Laserlicht	994da3fcf2	code review	2023-09-11 14:44:07 +02:00
Laserlicht	00f07f93d1	wait while audio playing; no audio on custom campaigns	2023-09-11 14:04:44 +02:00
Laserlicht	fc1ce85a72	basic voice support	2023-09-11 12:57:10 +02:00
Ivan Savenko	fd3217c875	Fix few more missing BattleID's	2023-09-11 13:20:16 +03:00
nordsoft	6e3817f18c	Events serialization	2023-09-10 01:54:55 +02:00
nordsoft	cc3864a0fa	Fix for random dwellings	2023-09-09 21:17:21 +02:00
nordsoft	01bf146640	Change string id	2023-09-09 14:31:44 +02:00
nordsoft	f6e3c6a487	Fix	2023-09-09 14:27:51 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	fccd564d8d	Merge pull request #2769 from IvanSavenko/touch_tolerance ... (1.3.2) Implemented tolerance for touch events	2023-09-08 16:45:04 +03:00
Ivan Savenko	c4e2417326	Fix crash on obstacle creation (e.g. moat)	2023-09-08 16:35:43 +03:00
Ivan Savenko	5d67481aaf	Merge pull request #2774 from IvanSavenko/beta_bugfixing ... (1.3.2) Beta bugfixing	2023-09-08 13:15:52 +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	1f1f978328	Fixed battle replay	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	f92af94f19	Fix crash on removing object during visit	2023-09-06 12:32:26 +03:00
Evgeniy Meshcheryakov	47f5dd14fa	Remove(reduce durations) of bonuses for tavern heroes	2023-09-06 09:12:23 +03:00
Ivan Savenko	3973624278	Implemented tolerance for touch events	2023-09-06 01:06:01 +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	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
nordsoft	d113168db4	Fix neutral objects serializing	2023-09-04 01:42:51 +04:00
nordsoft	385202a02a	Fix abandoned map crash	2023-09-04 01:42:51 +04:00
nordsoft	8040cafb3d	Code review tweaks	2023-09-01 15:17:46 +04:00
nordsoft	15037b782f	Fix assert	2023-09-01 04:39:32 +04:00
nordsoft	e9ba1d73d1	Support partial versions	2023-09-01 04:36:53 +04:00
nordsoft	ea7ab9d5ed	Migrate launcher to vcmi versions	2023-09-01 04:12:41 +04:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00
Konstantin P	08967efd91	Teleport: check immunities in applicable() ... Attempt to fix #2677	2023-08-31 19:58:46 +03:00
Ivan Savenko	7255dda624	Merge pull request #2629 from dydzio0614/neutral-creature-popup ... Improve neutral creature adventure map popup	2023-08-31 15:44:19 +03:00
Ivan Savenko	adb633be30	Merge pull request #2715 from IvanSavenko/regression_fix ... Fix several recently discovered regressions	2023-08-31 15:41:04 +03:00
Nordsoft91	49614f5851	Merge pull request #2695 from Nordsoft91/mod-compatibility	2023-08-31 12:14:54 +04:00
Ivan Savenko	3e169ef2f5	Fix visiting of markets	2023-08-31 01:07:59 +03: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
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
nordsoft	4ee47b01ae	Make possible to play with different timers independently	2023-08-28 19:45:15 +04:00
nordsoft	98f7ed9dfd	Implement player start turn query	2023-08-28 18:56:36 +04:00
nordsoft	93f14c984d	Fix compatibility check with patch version	2023-08-28 17:49:13 +04:00
nordsoft	925bde68ff	Fix compatibility check with game version	2023-08-28 17:43:33 +04:00
nordsoft	0a6ea63b09	Revert "Add compatibility with minor version" ... This reverts commit 6e7b13fcbe.	2023-08-28 17:41:00 +04:00
nordsoft	3962b71262	Remove unused variable	2023-08-28 17:10:52 +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
Nordsoft91	ffc4b989f0	Merge pull request #2679 from Laserlicht/smooth_scroll ... Smooth scroll	2023-08-28 17:08:57 +04:00
nordsoft	6e7b13fcbe	Add compatibility with minor version	2023-08-28 16:21:46 +04:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Michael	2286e0c7b1	implement speed and move	2023-08-26 21:13:33 +02:00