3285 Commits

Author	SHA1	Message	Date
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	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	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	b2279484fc	Merge pull request #1227 from Shatur/opendingux ... Port to OpenDingux handhelds	2022-12-22 16:56:55 +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
nordsoft	8f7025328f	Read default template from config, named custom types	2022-12-22 01:37:33 +04: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	822df113f3	Fix formatting	2022-12-21 13:18:16 +02:00
Ivan Savenko	b5925995b1	Fix transparency checks that were broken for palette images with alpha	2022-12-19 22:57:58 +02:00
Ivan Savenko	b373c4a2b6	Fix Status Bar & In-game console activation	2022-12-19 22:53:31 +02:00
Ivan Savenko	a75b437fef	Disable text input on window deactivation	2022-12-19 22:06:01 +02:00
Ivan Savenko	d29c9d6445	Fortify CLabel interface to prevent unchecked access	2022-12-19 22:04:50 +02:00
Ivan Savenko	fc4d2a31b4	Fix redrawing of hero exchange window on artifact (de)assembly	2022-12-18 15:09:33 +02:00
Ivan Savenko	57dba9433c	Correctly update drag-and-drop cursor if our window gets deactivated	2022-12-18 14:34:38 +02:00
nordsoft	d7b0770b71	Remove excessive code	2022-12-17 20:50:33 +04:00
nordsoft	9b76a8000f	Making team alignments widget customizable	2022-12-17 20:38:16 +04:00
nordsoft	b590e4a0e4	Fixes for multiplyer	2022-12-17 08:38:33 +04:00
nordsoft	b1f2c7aed4	Team alignments implemented	2022-12-17 08:19:16 +04:00
nordsoft	4f5fab702e	Support roads selection in random map tab	2022-12-17 04:54:37 +04:00
nordsoft	42281f51e8	Revert "Remove uncompleted code" ... This reverts commit 0c41787ca5.	2022-12-17 03:53:26 +04:00
nordsoft	bcf95c32e9	Merge branch 'fix-cmake' into interface-builder	2022-12-17 03:09:41 +04:00
nordsoft	268b87052b	Fix for hint	2022-12-16 02:49:52 +04:00
nordsoft	1d59dfecef	Support translations	2022-12-16 02:48:07 +04:00
nordsoft	8f089b3302	Rename folder	2022-12-16 02:19:23 +04:00
nordsoft	0c41787ca5	Remove uncompleted code	2022-12-16 02:17:10 +04:00
nordsoft	d3c3feb037	Configurable template selection	2022-12-16 02:15:53 +04:00
nordsoft	1d4209d97e	Continue refactoring	2022-12-16 00:57:10 +04:00
nordsoft	2371e3e9a2	Interface builder refactored	2022-12-16 00:46:36 +04:00
Hennadii Chernyshchyk	eec7d91f2c	Remove unused forward declaration	2022-12-15 15:33:30 +04:00
Hennadii Chernyshchyk	8de6c4a704	Fix SharedMemory declaration ... Should be under VCMI_LIB_NAMESPACE_BEGIN	2022-12-15 15:33:30 +04:00
Andrii Danylchenko	8c07ddbae0	Merge pull request #1204 from IvanSavenko/single_process_app_upgrade ... [1.2] Single process app support for platforms other than ios	2022-12-15 12:22:24 +02:00
nordsoft	2fe951f819	Merge remote-tracking branch 'upstream/develop' into interface-builder ... # Conflicts: # client/lobby/RandomMapTab.cpp	2022-12-15 04:47:11 +04:00
Hennadii Chernyshchyk	37068a75b3	Make ENABLE_NULLKILLER_AI top level option	2022-12-15 02:18:17 +02:00
nordsoft	4c3288dd61	Fix teams	2022-12-14 05:45:50 +04:00
nordsoft	fc7f1dbc5a	Fix template selection	2022-12-14 05:23:21 +04:00