3351 Commits

Author	SHA1	Message	Date
Ivan Savenko	4bfdb44c78	Restore status bar on BattleWindow reactivation	2022-12-30 12:32:36 +02:00
Ivan Savenko	f8dec3861b	Fixed animation skipping with no sound mod and enemy having first turn	2022-12-30 11:56:26 +02:00
Ivan Savenko	a9808a6541	Fix battle start when hero has tactics and no battle sounds mod is on	2022-12-30 11:55:22 +02:00
Ivan Savenko	81164100da	Fix crash on exiting game during battle	2022-12-30 11:54:37 +02:00
Ivan Savenko	5d80457eda	Merge with vcmi/develop branch	2022-12-30 00:52:23 +02:00
Ivan Savenko	c8cd8aaf10	merge fix - do not attempt to display multiple dialogs at once	2022-12-29 22:11:47 +02:00
Ivan Savenko	b275d9de72	merge beta branch into develop	2022-12-29 22:08:53 +02:00
Ivan Savenko	7a35bcc812	Merge pull request #1221 from IvanSavenko/warnings_fix ... Fix remaining compiler warnings	2022-12-29 21:51:55 +02:00
Ivan Savenko	b1082aa621	Do not attempt to display multiple assembly dialogs at once	2022-12-29 21:50:25 +02:00
Ivan Savenko	90b669f507	Fix order of dialogs on assembling artefacts after battle	2022-12-29 21:50:25 +02:00
Ivan Savenko	b6735618f5	Formatting	2022-12-29 21:50:04 +02:00
Ivan Savenko	986c0c534d	Main menu buttons are now defined using position of their center ... Fixes positioning of main menu buttons in localized versions of the game	2022-12-29 21:50:04 +02:00
Ivan Savenko	61ed408f61	Fix typo	2022-12-29 21:49:20 +02:00
Ivan Savenko	588b635d1c	Workaround for a potential deadlock in MusicHandler	2022-12-29 21:49:20 +02:00
Ivan Savenko	7a5258853a	Fix potential access violation due to iterator invalidation	2022-12-29 14:28:38 +02:00
Ivan Savenko	da7766e90b	Fix battle start with disabled opening sounds	2022-12-28 16:51:44 +02:00
Ivan Savenko	fa355c3356	Fix build	2022-12-26 01:38:25 +02:00
Ivan Savenko	bb65246aa3	Merge remote-tracking branch 'vcmi/develop' into battle_improvements	2022-12-26 01:15:44 +02:00
Ivan Savenko	ae3f6c5e79	Renamed PointEffectAnimation -> EffectAnimation	2022-12-25 21:39:55 +02:00
Ivan Savenko	5b41ced427	Removed sound playback from PointEffectAnimation	2022-12-25 21:35:13 +02:00
Ivan Savenko	7e3cd7db51	Fix for missing Death Blow sound	2022-12-25 20:11:22 +02:00
Ivan Savenko	5a7eed01da	Made BattleInterface class less friendly	2022-12-25 17:44:40 +02:00
Ivan Savenko	d1244e3714	Fix ios compile	2022-12-25 17:44:13 +02:00
Ivan Savenko	4b3d93f378	Minor cleanup	2022-12-25 17:43:55 +02:00
Ivan Savenko	c906b27859	Formatting	2022-12-25 17:42:54 +02:00
Ivan Savenko	405b2976d5	Renamed getUpgradeInfo -> fillUpgradeInfo	2022-12-25 14:03:43 +02:00
Andrii Danylchenko	33602c879d	#1286 - use iOS flow for Android resolutions management	2022-12-25 13:39:27 +02:00
Nordsoft91	785787e454	Merge branch 'develop' into interface-builder	2022-12-24 21:56:29 +04:00
Ivan Savenko	325c29da0d	Merge remote-tracking branch 'vcmi/develop' into battle_improvements	2022-12-23 14:51:34 +02:00
Ivan Savenko	eb20a4b208	Merge remote-tracking branch 'vcmi/develop' into warnings_fix	2022-12-23 14:40:45 +02:00
Ivan Savenko	f073c676f9	Merge 1.1 release into develop	2022-12-23 14:17:18 +02:00
Ivan Savenko	9248e06ae0	Demon summon is now a spell. DEMON_SUMMONING bonus has been removed	2022-12-22 23:11:55 +02:00
Ivan Savenko	b2279484fc	Merge pull request #1227 from Shatur/opendingux ... Port to OpenDingux handhelds	2022-12-22 16:56:55 +02:00
Ivan Savenko	5b453bf530	Stack amount boxes visibility now follows H3 rules	2022-12-22 11:49:40 +02:00
Ivan Savenko	8b207fae63	ECreatureAnimType enum -> enum class	2022-12-22 01:04:58 +02:00
Ivan Savenko	bab5922951	Spells can now define color muxer effect (e.g. Bloodlust & Petrify)	2022-12-22 00:25:35 +02:00
nordsoft	ad5bf2ac4f	Fix msvc build	2022-12-22 02:10:56 +04:00
nordsoft	cb76cc54ac	Move logging to debug level	2022-12-22 02:08:26 +04:00
nordsoft	e245dbaf9d	Use kind-of-factory approach for widget builders	2022-12-22 02:05:29 +04:00
Ivan Savenko	4fa01c4c7e	Fix potential overflow/underflow	2022-12-21 23:39:54 +02:00
nordsoft	8f7025328f	Read default template from config, named custom types	2022-12-22 01:37:33 +04:00
Ivan Savenko	41b87088d5	Color muxer effects can now be (partially) configured by user. ... TODO: move color muxer effects from spells into spell config	2022-12-21 23:29:56 +02:00
nordsoft	7e7071fc95	Merge remote-tracking branch 'upstream/develop' into interface-builder	2022-12-22 01:24:29 +04:00
nordsoft	c7f430f051	Added debug lines	2022-12-22 01:13:32 +04:00
nordsoft	521328addd	Adding macros for targeted object binding	2022-12-22 00:54:06 +04:00
Ivan Savenko	8a9a7b9650	Fix UI on battle start if hero has tactics	2022-12-21 20:01:50 +02:00
Ivan Savenko	b423b3fa6b	Fix dragon breath & fire shield	2022-12-21 18:04:54 +02:00
Ivan Savenko	d0f259bbf7	Fix battle shutdown	2022-12-21 18:04:19 +02:00
Ivan Savenko	541d98143b	Renamed BattleControlPanel -> BattleWindow	2022-12-21 17:06:47 +02:00
Ivan Savenko	c835a84051	Moved all GUI handling from BattleInterface to BattleControlPanel	2022-12-21 17:02:53 +02:00