14961 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
SoundSSGood	f66918ea14	bulk move to altar	2024-01-27 15:28:23 +02:00
SoundSSGood	652f009181	arts altar - arts holder	2024-01-27 15:28:21 +02:00
Laserlicht	e48e8e0f01	fix if attacked	2024-01-27 01:57:28 +01:00
Laserlicht	a2fd5039ab	setting	2024-01-27 01:16:55 +01:00
Laserlicht	e8c541f873	end with auto combat	2024-01-26 23:15:56 +01:00
Laserlicht	d53dd83466	fix; cleanup; optimized times	2024-01-26 21:58:39 +01:00
Laserlicht	6e957d4913	fix build	2024-01-26 20:31:57 +01:00
Laserlicht	3d57437e52	move logic to tick	2024-01-26 20:13:02 +01:00
Laserlicht	c426382687	Apply suggestions from code review ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-01-26 20:09:17 +01:00
Ivan Savenko	eaca128c99	Code cleanup	2024-01-26 19:15:57 +02:00
Ivan Savenko	322c5faf63	Merge remote-tracking branch 'vcmi/develop' into lobby	2024-01-26 16:52:23 +02:00
Ivan Savenko	388ca6e776	Added list of active accounts and rooms to UI. Added room creation logic	2024-01-26 16:32:36 +02:00
Ivan Savenko	4d0c0f10a9	Merge pull request #3530 from Laserlicht/tavern ... Invite hero	2024-01-26 13:12:55 +02:00
Laserlicht	28c6385211	fix	2024-01-26 11:17:38 +01:00
MnHebi	8b24b0e9a7	Add Marketplace, Blacksmith into extra buildings category to ensure they get built. Misc changes.	2024-01-26 00:56:36 +02:00
Laserlicht	7f58333ef9	quick combat vs ai	2024-01-25 23:44:41 +01:00
Laserlicht	c2c86ec278	fix	2024-01-25 21:11:42 +01:00
Laserlicht	3b9372c51c	Code review	2024-01-25 20:49:59 +01:00
Laserlicht	e434d5c0b7	Apply suggestions from code review ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-01-25 20:35:30 +01:00
MnHebi	4318b25399	Merge branch 'vcmi:develop' into develop	2024-01-25 21:27:06 +02:00
Ivan Savenko	891d25a634	Merge pull request #3552 from Laserlicht/video_button ... video button	2024-01-25 16:31:24 +02:00
Ivan Savenko	2a193effcc	Merge branch 'master' into 'develop'	2024-01-25 16:23:13 +02:00
MnHebi	a668dc2721	Try to improve VCAI building build order. Testing reveals extra structures still get done before intended build order(seen Market being built when Dwellings were expected).	2024-01-25 03:26:42 +02:00
Laserlicht	e3acb92863	codestyle	2024-01-24 20:32:39 +01:00
Ivan Savenko	3d2f69199a	Merge pull request #3558 from IvanSavenko/release_145 ... Release 1.4.5	2024-01-24 16:26:01 +02:00
Ivan Savenko	d69e0b23e8	Update changelog	2024-01-24 14:47:49 +02:00
Ivan Savenko	88e54685b3	Merge pull request #3547 from Alexander-Wilms/macos-cpack-workaround ... Add second workaround for CPack issue on macOS	2024-01-24 13:48:49 +02:00
Tomasz Zieliński	a2e0742ffb	Fix invalid logic which made AI not attack guards	2024-01-24 13:45:05 +02:00
Ivan Savenko	2f5bf64340	Do not crash on attempt to load campaign with unsupported maps	2024-01-24 13:44:22 +02:00
Ivan Savenko	702fc8077d	Fix possible crash on invalid spell	2024-01-24 13:43:35 +02:00
Ivan Savenko	b7662c5ec6	Android build ID bump	2024-01-24 13:43:16 +02:00
Ivan Savenko	0287d8d51f	Merge pull request #3554 from vcmi/fix_ignore_guards ... Fix invalid logic which made AI not attack guards	2024-01-24 13:43:02 +02:00
Tomasz Zieliński	dbf53d78ba	Fix invalid logic which made AI not attack guards	2024-01-24 06:20:46 +01:00
Laserlicht	8870547d02	simplyfied	2024-01-24 01:23:35 +01:00
Laserlicht	e59078320c	format fix	2024-01-24 01:22:34 +01:00
Laserlicht	134eaa1583	sync subtitle	2024-01-24 01:17:23 +01:00
Laserlicht	56db0e06cf	fix render artefacts remaining after video playback	2024-01-24 00:04:56 +01:00
Laserlicht	0df4f9bda5	video button	2024-01-23 23:45:31 +01:00
Alexander Wilms	1975a08a3c	Retry cpack until it succeeds	2024-01-23 14:13:35 +00:00
Ivan Savenko	46c4f39eb8	Merge pull request #3546 from IvanSavenko/fix_freeze_on_start ... Fix freeze on map start	2024-01-23 15:07:20 +02:00
Alexander Wilms	d937d26b80	CPack isn't used for iOS builds, so only kill XProtect if we're building for macOS ... Also wait at most 10 s for XProtect to be killed	2024-01-23 12:45:49 +00:00
Ivan Savenko	aff9fddd03	Version bump to 1.4.5	2024-01-23 13:56:28 +02:00
Asirome	183612d32b	Updated spanish.ts translation	2024-01-23 13:48:51 +02:00
godric3	ccc8d28043	Fix inspector using wrong editor for some values	2024-01-23 13:45:47 +02:00
Tomasz Zieliński	5836e390f1	Do not place zone guards adjacent to 3rd zone	2024-01-23 13:45:35 +02:00
Ivan Savenko	634b90169d	Merge pull request #3549 from macomarivas/develop ... Updated Spanish translation	2024-01-23 13:39:45 +02:00
Ivan Savenko	a1126c2c68	Merge pull request #3541 from godric3/map-editor-inspector-edit-fix ... Fix inspector randomly using wrong editor(delegate) for some fields	2024-01-23 13:39:23 +02:00
Ivan Savenko	b51e58cddc	Merge pull request #3544 from vcmi/fix_leaky_connections ... Do not place zone guards adjacent to 3rd zone	2024-01-23 13:39:11 +02:00
Ivan Savenko	be47c66c57	Ignore hidden mods when checking mod dependencies	2024-01-23 12:57:38 +02:00
Asirome	e9c84e5b1e	Merge pull request #3 from macomarivas/updated-spanish-translation ... Updated spanish.ts translation	2024-01-23 11:12:33 +01:00