393 Commits

Author	SHA1	Message	Date
Ivan Savenko	7a92aa0a06	Fixes for compilation with Qt6	2023-01-17 12:49:33 +02:00
Ivan Savenko	b9712b0899	Fix translation search paths on ios	2023-01-16 22:37:19 +02:00
nordsoft	1ef9610e30	Remove irrelevant comment	2023-01-16 20:58:19 +04:00
nordsoft	da085b0058	Code review tweaks	2023-01-16 20:58:19 +04:00
nordsoft	2cce15efbe	Automatic mod conflict resolution	2023-01-16 20:58:19 +04:00
nordsoft	a2e358876c	Health check fix	2023-01-16 20:58:19 +04:00
nordsoft	14fc1c3f26	Cosmetic changes	2023-01-16 20:58:19 +04:00
nordsoft	8e1d8f835a	Implemented support of protocol 4	2023-01-16 20:58:19 +04:00
Ivan Savenko	c252837b6a	Fix installation of compiled QM files	2023-01-16 18:02:11 +02:00
Ivan Savenko	96141f010b	Merge remote-tracking branch 'vcmi/develop' into translate_launcher	2023-01-15 23:55:49 +02:00
Ivan Savenko	434163461e	Added logging for translation search	2023-01-15 23:54:27 +02:00
Ivan Savenko	494274ee46	Fix single-app build	2023-01-15 23:53:27 +02:00
Ivan Savenko	246281e62a	Merged vcmi/beta with vcmi/develop	2023-01-15 17:46:42 +02:00
Ivan Savenko	bec894c348	Implemented automatic detection of H3 files language/encoding	2023-01-15 17:32:39 +02:00
Andrey Filipenkov	2de48624bc	[iOS] fix linking QtCore	2023-01-15 17:28:09 +02:00
Ivan Savenko	9658ffba99	Allow disabling & deleting local mods other than vcmi mod	2023-01-12 16:29:01 +02:00
Ivan Savenko	192e856797	merge with vcmi/develop	2023-01-11 16:47:53 +02:00
Ivan Savenko	e28250b899	Add missing include?	2023-01-07 18:26:02 +02:00
Ivan Savenko	b1427f695b	Fix MXE	2023-01-07 18:01:39 +02:00
Ivan Savenko	67f7e5d042	Apply review suggestions	2023-01-07 16:15:45 +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	78ae6d6ed0	Made scaling of left panel limited, within well-defined bounds	2022-12-29 16:38:43 +02:00
Ivan Savenko	8010bff866	Formatting	2022-12-29 16:37:38 +02:00
Ivan Savenko	b1aaa09b8b	Fix search paths for translation	2022-12-29 16:37:03 +02:00
Ivan Savenko	d3a4a38694	Add editor icon to launcher	2022-12-28 22:45:47 +02:00
Ivan Savenko	3704102e1d	Editor -> Map Editor string	2022-12-28 22:22:43 +02:00
Ivan Savenko	4f4a89e15d	Fix formatting	2022-12-28 22:22:05 +02:00
Ivan Savenko	e6a83ad53b	Attempt to improve layout on mobile devices	2022-12-28 22:20:27 +02:00
Ivan Savenko	d11abdcdef	Updated icons with larger versions for scaling	2022-12-28 22:19:45 +02:00
Ivan Savenko	df3d62c5bc	Formatting fix	2022-12-28 18:04:27 +02:00
Ivan Savenko	5f4a998435	editorPath -> mapEditorPath	2022-12-28 17:59:16 +02:00
Ivan Savenko	cd6a894417	Call method from parent class after processing event	2022-12-28 17:58:39 +02:00
Ivan Savenko	858fb97f42	Added -DENABLED_LAUNCHER and -DENABLED_EDITOR defines	2022-12-28 17:56:22 +02:00
Ivan Savenko	42ecf05c47	Regenerated translations	2022-12-28 12:40:39 +02:00
Ivan Savenko	60f25f7a0c	Added Polish translation by dydzio	2022-12-28 12:29:26 +02:00
Ivan Savenko	2687b7af7f	Increased default width of lobby room creation window	2022-12-28 12:28:59 +02:00
Ivan Savenko	b6f13ea50c	Fix formatting	2022-12-27 12:28:40 +02:00
Ivan Savenko	5dea5fcd85	Fix ios build	2022-12-26 00:22:20 +02:00
Ivan Savenko	1f0ad8e149	Regenerated translations	2022-12-26 00:10:31 +02:00
Ivan Savenko	9fb426edc1	Do not use translator without translator tools	2022-12-25 23:42:06 +02:00
Ivan Savenko	e4e5278f60	Merge with vcmi/develop	2022-12-25 23:10:52 +02:00
Ivan Savenko	20dec34484	Attempt to make translations optional (MXE...)	2022-12-25 23:09:15 +02:00
Ivan Savenko	b38752bde1	Editor can be started from Launcher (disabled for ios)	2022-12-25 23:08:39 +02:00
Ivan Savenko	4cd91ffbed	Save & load language selection	2022-12-25 23:06:22 +02:00
Ivan Savenko	b012cd9490	Compiled launcher translations are now in launcher/translations/ dir	2022-12-25 22:18:14 +02:00
Ivan Savenko	a0c78e8ecb	Added german translation by Laserlicht	2022-12-25 21:58:20 +02:00
Ivan Savenko	a481961c57	Added dummy files for WIP translations	2022-12-25 21:41:45 +02:00
Ivan Savenko	1696db8a3c	Launcher translation upgrade, still WIP: ... - launcher can be re-translated without restart - mod info (name/description/etc) can have localized versions	2022-12-25 13:19:16 +02:00
Ivan Savenko	5b57b69699	Bumped version to 1.2 for Linux packaging	2022-12-23 17:54:41 +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	b84e0775b3	Updated release date for Linux packaging	2022-12-23 10:41:59 +04:00
Ivan Savenko	9e4cef015d	Initial test version of selectable translations for launcher.	2022-12-19 19:12:44 +02:00
nordsoft	dd95d92735	Fix compatibility check	2022-12-17 22:56:33 +04:00
Ivan Savenko	db2a40600d	Fixed some of the warnings detected by CI run	2022-12-08 23:20:42 +02:00
Ivan Savenko	facf77b3ae	vstd::unique -> std::unique	2022-12-07 23:36:20 +02:00
Ivan Savenko	3219e322ae	Fixed all non-silenced gcc/clang warnings	2022-12-07 18:05:47 +02:00
Ivan Savenko	e09f42f487	Reverted launcher change: launcher should use shared version of libvcmi	2022-12-06 21:11:20 +02:00
Ivan Savenko	4e43f5bdc2	Removed dllimport/export from single-app launcher build	2022-12-06 19:39:33 +02:00
Ivan Savenko	fa23965d0b	Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD	2022-12-06 00:00:56 +02:00
Ivan Savenko	d7cf5a0479	Version bump for Appstream metadata	2022-12-02 12:57:36 +02:00
Nordsoft91	89b8b87a6b	Merge pull request #1156 from vcmi/features/online ... Online mode	2022-11-29 20:43:39 +04:00
nordsoft	98d59eb221	Added more comments	2022-11-29 19:42:09 +04:00
nordsoft	b9ef95be3e	Extend protocol	2022-11-27 05:35:05 +04:00
nordsoft	63a402a7fa	Some ui improvements	2022-11-27 03:41:06 +04:00
nordsoft	f785525508	Fix mods updating	2022-11-23 21:34:05 +04:00
nordsoft	665d6ebb78	Ios scroll by gesture	2022-11-22 03:36:50 +04:00
nordsoft	6ab8fccc60	Fix crash	2022-11-17 05:06:23 +04:00
nordsoft	ddebf85665	try to fix mxe	2022-11-17 04:30:43 +04:00
nordsoft	33575e5ce2	Try to fix mxe build	2022-11-17 04:05:44 +04:00
nordsoft	05e4188908	Support mod list	2022-11-17 03:15:26 +04:00
nordsoft	4527bd1a61	Disconnection on error	2022-11-16 23:53:54 +04:00
nordsoft	179cdee424	Improve online lobby visual	2022-11-16 23:28:21 +04:00
nordsoft	20573073c9	Some tweaks	2022-11-16 04:42:43 +04:00
nordsoft	15ba4cda70	Cosmetic improvements for lobby	2022-11-16 04:22:48 +04:00
nordsoft	8d6a2e4383	Fix indentation	2022-11-15 22:09:47 +04:00
nordsoft	50a157bfd2	support encoding	2022-11-15 22:09:47 +04:00
nordsoft	694fedc662	Fix crash due to passing args	2022-11-15 22:09:46 +04:00
nordsoft	cfe1867d4a	Fix ios build	2022-11-15 22:09:46 +04:00
nordsoft	b2b9cacac2	Fix mxe build	2022-11-15 22:09:46 +04:00
nordsoft	a45fb910af	Try to fix mxe build	2022-11-15 22:09:46 +04:00
nordsoft	eda102ddfb	Add header for mxe build	2022-11-15 22:09:46 +04:00
nordsoft	0a149ba73b	Fix launcher crash at close	2022-11-15 22:09:46 +04:00
nordsoft	f0ac73b217	Fix(?) mxe lobby	2022-11-15 22:09:46 +04:00
nordsoft	f79e5a82d3	Fix crash	2022-11-15 22:09:46 +04:00
nordsoft	3d60f079fb	Remove some ios specific flags	2022-11-15 22:09:46 +04:00
nordsoft	c4c1cd392a	Attempt to fix server hosting on ios	2022-11-11 22:21:03 +04:00
nordsoft	d691925b1f	Try to do some fixes	2022-11-11 00:02:00 +04:00
nordsoft	9397c836f2	Enable scrolling for buttons	2022-11-10 19:15:18 +04:00
nordsoft	81a0ac2398	Lobby refactoring and changes	2022-11-10 04:20:44 +04:00
nordsoft	f83e4f4ce4	Add lobby icon	2022-11-09 00:21:26 +04:00
nordsoft	43ca275afa	Fix ios typo	2022-11-09 00:03:15 +04:00
nordsoft	e83870205e	Global veriables	2022-11-08 20:47:01 +04:00
nordsoft	57dfeb2ff2	Remove excessive code	2022-11-08 05:03:33 +04:00
nordsoft	17d8c646f2	Command line arguments for ios	2022-11-08 05:02:26 +04:00
nordsoft	97e5fc8a07	Lobby works	2022-11-08 04:44:34 +04:00
nordsoft	7b6d9c23b3	Attempt to pass lobby parameters as command line arguments	2022-11-07 13:44:58 +04:00
nordsoft	1c84cc4521	Merge remote-tracking branch 'upstream/develop' into lobby	2022-11-01 16:30:27 +04:00
nordsoft	410c402dd6	Try to fix windows encoding	2022-10-30 22:53:05 +04:00
nordsoft	ecfa568774	Minor fixes for lobby	2022-10-30 22:50:16 +04:00
nordsoft	d8641324a3	Try to fix mxe build	2022-10-29 21:49:30 +04:00
nordsoft	0a2a250379	Try to fix mxe build	2022-10-29 21:10:21 +04:00
nordsoft	6eb43d3834	Minor changes	2022-10-27 01:39:57 +04:00
nordsoft	1455c65e1a	Move proxy server	2022-10-27 00:53:32 +04:00
nordsoft	21a1706627	First working prototype	2022-10-27 00:52:39 +04:00
nordsoft	dd45d1a9cf	Develop game part	2022-10-25 05:27:53 +04:00
nordsoft	aac859a030	Store settings	2022-10-23 23:24:33 +04:00
nordsoft	2761c59cf0	Add server prototype	2022-10-23 23:11:19 +04:00
nordsoft	05cba08b40	Continue development	2022-10-23 23:10:46 +04:00
nordsoft	75613a947d	Implement command parsing	2022-10-23 02:55:22 +04:00
Andrey Filipenkov	278e6bedeb	[Linux] add proper desktop entry for the map editor	2022-10-22 17:08:55 +03:00
Andrii Danylchenko	c2cc801f60	Merge pull request #1073 from kambala-decapitator/ios-conan ... [Conan] add iOS support, bump dependencies, improvements	2022-10-22 12:40:48 +03:00
nordsoft	e54c9af24e	Continue development	2022-10-21 20:29:27 +04:00
nordsoft	b58f70ac5e	Prototype	2022-10-21 05:53:30 +04:00
nordsoft	2409bdfbda	Fix screenshots loading	2022-10-21 04:03:54 +04:00
Andrey Filipenkov	f10e5e3b99	[Conan] add iOS support	2022-10-16 13:25:38 +03:00
Andrey Filipenkov	b29229a577	fix showing logs path in Launcher	2022-10-09 17:42:33 +03:00
Andrii Danylchenko	238dabe060	Merge pull request #1055 from kambala-decapitator/version-from-cmakelists ... define app version only in CMakeLists	2022-10-08 09:55:59 +03:00
Andrii Danylchenko	8b1a2a3ff3	Merge pull request #1039 from Nordsoft91/modinfo-from-json ... Modinfo from json	2022-10-06 17:11:08 +03:00
Andrey Filipenkov	92dd6d8c17	define app version only in CMakeLists ... now it's propagated to code via macros	2022-10-04 12:29:38 +03:00
Andrii Danylchenko	d07586ccf6	Merge pull request #1022 from kambala-decapitator/apple-set-app-version ... [Apple] set proper app and build versions	2022-10-01 20:48:37 +03:00
Andrey Filipenkov	796845d173	[iOS] clear focus in launcher only when something has focus	2022-10-01 12:37:23 +03:00
Andrii Danylchenko	99502c97d0	Merge pull request #1012 from kambala-decapitator/ios-launcher-prevent-autofocus ... prevent keyboard appearing automatically after switching tab	2022-10-01 09:18:10 +03:00
Andrii Danylchenko	a2dbb6c8ac	Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions ... Hide unsupported resolutions	2022-09-30 17:34:07 +03:00
Andrey Filipenkov	4a1933bac3	display build version in the launcher	2022-09-30 12:33:37 +03:00
Alexander Wilms	48150211d9	Update bug tracker URL in metainfo	2022-09-29 23:07:54 +02:00
nordsoft	9bf7106905	Add compatibility info	2022-09-29 18:21:29 +04:00
nordsoft	ae15807964	Collect mod info from remote mod.json	2022-09-29 17:38:03 +04:00
Andrey Filipenkov	d1d274382c	[iOS] prevent keyboard appearing automatically after switching tab in launcher	2022-09-29 12:17:37 +03:00
Andrey Filipenkov	e8396401f9	fetch Extra Resolutions mod path from the settings schema	2022-09-27 11:56:13 +03:00
Andrey Filipenkov	42ea458ccf	handle (un)installing Extra Resolutions mod	2022-09-27 11:56:13 +03:00
Andrey Filipenkov	d06977ecbb	handle enabling/disabling Extra Resolutions mod	2022-09-27 11:56:13 +03:00
Andrey Filipenkov	76b36b8951	iOS can use any resolution	2022-09-27 11:56:12 +03:00
Andrey Filipenkov	063f80fac3	don't list resolutions larger than the selected screen's in the launcher	2022-09-27 11:56:12 +03:00
Andrey Filipenkov	9aad1ae95e	handle integer type in vcmi <-> Qt JSON interoperability	2022-09-27 11:56:12 +03:00
Andrey Filipenkov	36cbb2f605	make Display Index combobox empty by default	2022-09-27 11:56:12 +03:00
Andrey Filipenkov	cfba8a5373	replace deprecated signal	2022-09-27 11:56:12 +03:00
Andrey Filipenkov	f0b909f772	code improvement	2022-09-27 11:56:12 +03:00
Andrey Filipenkov	53ac61b52b	iOS: don't create unused CConsoleHandler	2022-09-27 07:05:10 +03:00
Andrii Danylchenko	6ad468ecd3	Merge pull request #995 from Nordsoft91/hotfix/mods-deps ... Hotfix for mods dependencies	2022-09-26 09:14:18 +03:00
nordsoft	5552fbb8e6	Fix ios build	2022-09-25 16:24:25 +04:00
nordsoft	54e0bb17fd	[994] fixed	2022-09-25 16:17:21 +04:00
nordsoft	af98ce2e3d	Hotfix for mods dependencies	2022-09-25 15:36:46 +04:00
Andrey Filipenkov	b8eef4ce35	support building against iOS SDK < 13.0	2022-09-24 15:55:25 +03:00
Andrey Filipenkov	44174da9a2	fix MXE build	2022-09-24 15:55:25 +03:00
Andrey Filipenkov	7b411a5fc4	fix building vcmiERM for iOS	2022-09-24 15:55:24 +03:00
Andrey Filipenkov	fab3216df0	add setting to control app launch type: launcher or game ... - removes custom AppDelegate - now starting launcher using qt_main_wrapper - when starting SDL from launcher, SDLUIKitDelegate is created and assigned as app delegate fix kambala-decapitator/vcmi#33	2022-09-24 15:55:23 +03:00
Andrey Filipenkov	1e01780d17	start app with launcher, start SDL from launcher ... kambala-decapitator/vcmi#33	2022-09-24 15:55:22 +03:00
Andrey Filipenkov	10a14bd6fd	remove no longer used iOS launcher files	2022-09-24 15:55:22 +03:00
Andrey Filipenkov	5e838008df	merge launcher and client ... launcher is a static lib now	2022-09-24 15:55:22 +03:00