14778 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	48006307e1	Merge pull request #3563 from Laserlicht/quick_combat ... quick combat vs ai	2024-01-30 17:33:34 +02:00
SoundSSGood	d16632b54c	cleanup & fix build & sonarcloud fixes	2024-01-30 01:23:50 +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
Ivan Savenko	bed05eb52d	WIP: Implemented joining public rooms	2024-01-28 00:04:54 +02:00
Ivan Savenko	6d2ca070ea	Show number of players in open room	2024-01-27 23:41:36 +02:00
Laserlicht	36881c226f	fix infobox position while disabling	2024-01-27 22:08:15 +01:00
SoundSSGood	c6ca6ad835	sacrifice routine	2024-01-27 23:01:57 +02: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
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