14681 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	5d8b65befd	Merge pull request #3575 from Laserlicht/infobox_pos ... fix infobox position while disabling	2024-01-30 17:36:30 +02:00
Ivan Savenko	26703af8b0	Merge pull request #3576 from Alexander-Wilms/conditional-screen-clearing ... CVideoHandler: Call SDL_RenderClear() when playing intro, call SDL_Re…	2024-01-30 17:36:18 +02:00
Ivan Savenko	9051cd9654	Merge pull request #3569 from Laserlicht/end_autocombat ... instant finish of battle with autocombat	2024-01-30 17:34:56 +02:00
Ivan Savenko	48006307e1	Merge pull request #3563 from Laserlicht/quick_combat ... quick combat vs ai	2024-01-30 17:33:34 +02:00
Laserlicht	1124b43d91	check tactic side	2024-01-29 21:52:11 +01:00
Laserlicht	4aaebc834e	Merge branch 'develop' into end_autocombat	2024-01-29 21:36:11 +01:00
Laserlicht	7cc004e139	code review	2024-01-29 21:33:20 +01:00
Laserlicht	7ddc87f4a2	removed unused param; optimized pos	2024-01-29 21:11:18 +01:00
Alexander Wilms	6085893c0d	CVideoPlayer: Make overlay an argument of playVideo() instead of an attribute	2024-01-29 20:27:00 +01:00
Alexander Wilms	70ce090bc4	CVideoHandler: Use EVideoType::INTRO and EVideoType::SPELLBOOK	2024-01-29 16:08:53 +01:00
Ivan Savenko	dc2f8cb81d	Merge pull request #3553 from Laserlicht/sync_subtitle ... sync subtitle with audio	2024-01-29 12:54:43 +02:00
Ivan Savenko	68f9ef1a32	Merge pull request #3573 from Laserlicht/adv_option ... hint about missing functionality in AdvOption	2024-01-29 12:53:54 +02:00
Alexander Wilms	33e170d562	CVideoHandler: Call SDL_RenderClear() when playing intro, call SDL_RenderFillRect() for spellbook animation	2024-01-28 22:53:51 +01:00
Laserlicht	36881c226f	fix infobox position while disabling	2024-01-27 22:08:15 +01:00
Laserlicht	4508800400	fix transl	2024-01-27 17:41:21 +01:00
Laserlicht	0225590bb5	add info for not implemented replay; reorder button code; fix exit position	2024-01-27 17:36:19 +01:00
Laserlicht	cad0d5db16	consider unlimited replay (or not)	2024-01-27 15:02:03 +01:00
Laserlicht	3e71cbcc39	Block feature is battle against human	2024-01-27 14:35:54 +01: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	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
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
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
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 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