11605 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Konstantin	74656b9f96	vcmi: disable MapComparer team check for now	2023-04-27 20:59:55 +03:00
Konstantin	91c7c93d07	vcmi: fix MapComparer appearance check	2023-04-27 20:59:55 +03:00
Konstantin	bcf8ca1268	vcmi: fix map format for teams number	2023-04-27 20:59:55 +03:00
Konstantin	d31a3362af	vcmi: map objects test passed ... It is weird, because some objects should have mod scope now, and some not We need to fix this, and rework test if necessary - its data is too huge now.	2023-04-27 20:59:55 +03:00
Konstantin	bd7faddb55	vcmi: more verbose JSON compare	2023-04-27 20:59:55 +03:00
Konstantin	015f55cd82	vcmi: fix building tests without scripts	2023-04-27 20:59:55 +03:00
Konstantin	276bd5eebf	vcmi: fix healing effect tests	2023-04-27 20:59:55 +03:00
Konstantin	42984396ff	all: fix ImmunityNegationConditionTest	2023-04-27 20:59:55 +03:00
Konstantin	56601a0c2a	vcmi: entity tests passed	2023-04-27 20:59:55 +03:00
Konstantin	2680046dd0	vcmi: make tests builds at least	2023-04-27 20:59:55 +03:00
Konstantin	cf2304d8c7	vcmi: new commits in submodules	2023-04-27 20:59:55 +03:00
Konstantin P	b472c89276	vcmi: make some CStack properties private ... There is a getters for this properties already available	2023-04-27 20:58:49 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
krs	1bb5077231	Renamed getMovementRange to ObtainMovementRange as per request	2023-04-26 21:56:20 +04:00
krs	e348193f7e	Tactics movement is limited to movement range	2023-04-26 21:56:20 +04:00
nordsoft	c899956e71	Fix boat visibility	2023-04-26 02:58:11 +04:00
Tomasz Zieliński	3c9599657b	Use new artifact interface	2023-04-25 16:20:36 +02:00
Tomasz Zieliński	208adf1dd6	Don't use boost::format	2023-04-25 16:14:09 +02:00
Ivan Savenko	9296306fa3	Merge pull request #2041 from IvanSavenko/bugfixing_for_hotfix ... Fixes for 1.2.1	2023-04-24 18:13:00 +03:00
Ivan Savenko	3489c4fd5c	Merge pull request #2062 from heroesiiifan/patch-2 ... add color to translation	2023-04-24 17:19:36 +03:00
Ivan Savenko	48abf46824	Merge pull request #2005 from IvanSavenko/advmap_refactor ... Refactoring of adventure map interface	2023-04-24 17:19:22 +03:00
Ivan Savenko	3ac713d6a8	Fix crash on dereferencing nullptr	2023-04-24 17:17:12 +03:00
Ivan Savenko	d3c1c92a03	Do not update minimap using puzzle map data	2023-04-24 17:16:55 +03:00
Ivan Savenko	fa156568c4	Fixes according to review	2023-04-24 16:58:15 +03:00
Andrii Danylchenko	f2506dd196	Fix hero count calculation for resourceful ai mod	2023-04-24 16:57:31 +03:00
Andrii Danylchenko	d2530f66bf	#2018 - fix shipyard usage for NKAI, allied shipyard should work now	2023-04-24 16:56:07 +03:00
heroesiiifan	a190dbbb17	add color	2023-04-23 18:39:48 +00:00
heroesiiifan	5c2205184e	add colors	2023-04-23 18:37:15 +00:00
Nordsoft91	f39f208e05	Merge pull request #1915 from Nordsoft91/vcmi-campaign ... VCMI campaigns format	2023-04-23 19:09:59 +04:00
Andrii Danylchenko	eff158a9a8	Fix killing hero with grail	2023-04-23 16:17:27 +03:00
Andrii Danylchenko	13ea8facdf	Merge pull request #2051 from vcmi/nkai-fix-recruiting-hero ... Nkai fix recruiting hero	2023-04-23 16:14:40 +03:00
SoundSSGood	dcac8252f3	fixed windows positions	2023-04-23 14:57:45 +03:00
SoundSSGood	1f4897e841	CArtifactSet::getSlotByInstance	2023-04-23 14:48:04 +03:00
SoundSSGood	a8220c551f	fixed init CArtifactsOfHero	2023-04-23 14:33:47 +03:00
SoundSSGood	c86af54ce1	arts move condition fix	2023-04-23 14:18:55 +03:00
SoundSSGood	177523d972	askToAssemble, askToDisassemble	2023-04-23 14:17:27 +03:00
SoundSSGood	1046964eef	CArtifactHolder	2023-04-23 14:14:24 +03:00
Tomasz Zieliński	a9a3c456f1	Add new files	2023-04-23 10:12:53 +02:00
Tomasz Zieliński	bc4d6bb7ee	Remove unused code.	2023-04-23 10:08:30 +02:00
Tomasz Zieliński	80b5c53815	Place quest artifacts after all the treasures are already created.	2023-04-23 10:08:16 +02:00
Andrii Danylchenko	fbc9a32ad8	#2018 - fix shipyard usage for NKAI, allied shipyard should work now	2023-04-22 18:42:36 +03:00
DjWarmonger	1fde8b588b	Merge pull request #2025 from vcmi/zone_placement2 ... No interest or objections - merging.	2023-04-22 14:45:53 +02:00
Andrii Danylchenko	d347db4c16	Fix hero count calculation for resourceful ai mod	2023-04-22 14:47:31 +03:00
Nordsoft91	a553a4aa66	Merge pull request #2030 from Nordsoft91/boats	2023-04-22 03:27:00 +04:00
Ivan Savenko	80b37a3019	Fixed remaining regressions	2023-04-20 22:19:10 +03:00
Ivan Savenko	bb08a0afc8	Moved selection logic to player state	2023-04-20 22:04:24 +03:00
Ivan Savenko	e8718a46cc	Fix regressions	2023-04-20 22:04:24 +03:00
Ivan Savenko	dd227d24c3	Formatting and cleanup	2023-04-20 22:04:24 +03:00
Ivan Savenko	365f552fa1	Added API for owned towns access	2023-04-20 22:04:24 +03:00
Ivan Savenko	5cbd0f8fc8	API for wandering heroes access	2023-04-20 22:04:24 +03:00