205 Commits

Author	SHA1	Message	Date
Ivan Savenko	57ee9a9bf3	Merge vcmi/beta into vcmi/develop	2023-01-29 18:21:55 +02:00
Andrii Danylchenko	4cfc93d2da	Somehow it works but JNI signatures were incorrect	2023-01-25 08:59:59 +02:00
nordsoft	c0c1be2645	Fix invalid host connection	2023-01-16 20:58:19 +04:00
Ivan Savenko	7a35bcc812	Merge pull request #1221 from IvanSavenko/warnings_fix ... Fix remaining compiler warnings	2022-12-29 21:51:55 +02:00
Nordsoft91	64fb4a744e	Merge pull request #1269 from vcmi/beta ... Merge android fix into develop	2022-12-24 22:07:04 +04:00
nordsoft	2953b8fe9d	Fix android build	2022-12-23 19:12:48 +04:00
nordsoft	1250f67771	Fix android build	2022-12-23 16:42:32 +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	12d4204334	Fix closing server on ios	2022-12-19 01:37:38 +04:00
Hennadii Chernyshchyk	de33eb44f9	Port to OpenDingux handhelds	2022-12-13 03:55:54 +02:00
Ivan Savenko	facf77b3ae	vstd::unique -> std::unique	2022-12-07 23:36:20 +02:00
Ivan Savenko	6463e906d5	vcmi can be compiled as single app on Linux ... TODO: check compilation on Win/Mac using Github Actions	2022-12-05 21:36:02 +02:00
nordsoft	915d215076	Fix connections amount problem	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	eeeca5ba8d	Add additional logging	2022-11-11 18:00:09 +04:00
nordsoft	9ffc50457a	Bypass command line args to vcmiserver	2022-11-08 18:05:47 +04:00
nordsoft	97e5fc8a07	Lobby works	2022-11-08 04:44:34 +04:00
nordsoft	6eb43d3834	Minor changes	2022-10-27 01:39:57 +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	2645843d4f	Fix dead server	2022-10-08 22:23:02 +04:00
nordsoft	63b29cbaea	Code review tweaks	2022-10-08 19:52:53 +04:00
nordsoft	e718f7fe39	Fix reconnection	2022-10-06 19:23:34 +04:00
nordsoft	ea49b8cf40	Cleanup code	2022-10-06 17:56:54 +04:00
nordsoft	3ff38b84a2	Support hotseat over multiplier	2022-10-05 01:54:31 +04:00
nordsoft	77ff6a64e6	Show message about client connecting and disconnecting	2022-10-05 00:51:34 +04:00
nordsoft	930f03e812	uuid check	2022-10-04 20:54:40 +04:00
nordsoft	0ea5a8fbe7	Merge remote-tracking branch 'upstream/develop' into mp-disconnection ... # Conflicts: # server/CVCMIServer.cpp	2022-10-04 17:41:43 +04:00
nordsoft	722acb2a1d	Reconnection works	2022-10-04 05:42:14 +04:00
nordsoft	16a5414247	Reconnection partially works	2022-10-04 05:09:03 +04:00
Andrii Danylchenko	382b3ae94a	Merge pull request #1041 from vcmi/nkai-fixes ... NKAI: android fixes	2022-10-03 20:30:05 +03:00
Andrii Danylchenko	04490b709a	Merge pull request #1000 from vcmi/multiplayer ... Multiplayer	2022-10-03 20:16:39 +03:00
nordsoft	512cf014aa	Freeze current state	2022-10-03 20:47:00 +04:00
nordsoft	f4b7cf8196	Transfer player ownership to AI	2022-10-03 20:47:00 +04:00
Andrii Danylchenko	8f599ed043	NKAI: android fixes	2022-10-03 09:01:15 +03:00
Andrii Danylchenko	2434fe3f6f	NK: fix AI speed	2022-10-01 13:49:27 +03:00
nordsoft	fea05a4320	Finally game restart works ... # Conflicts: # lib/CGameState.cpp # server/CVCMIServer.cpp	2022-09-29 21:08:05 +04:00
nordsoft	cbfa125085	Remove commented line	2022-09-29 14:29:57 +04:00
nordsoft	bebe0dd86c	Some change	2022-09-29 00:35:38 +04:00
nordsoft	2eb497b477	Looks like everything works	2022-09-28 23:38:41 +04:00
Andrey Filipenkov	53ac61b52b	iOS: don't create unused CConsoleHandler	2022-09-27 07:05:10 +03:00
Nordsoft91	d4f97aadf0	Merge branch 'develop' into incomatibility-response	2022-09-25 13:26:07 +04:00
Andrey Filipenkov	9f46bf5bff	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2022-09-24 15:55:26 +03:00
Andrey Filipenkov	605d5b6481	add dedicated macro when building as single process ... fix kambala-decapitator/vcmi#40	2022-09-24 15:55:25 +03:00
Andrey Filipenkov	cd4b68c034	fix repeated launches of single player ... now server actually terminates	2022-09-24 15:55:22 +03:00
Andrey Filipenkov	342a859a3f	fix typo	2022-09-24 15:55:21 +03:00
Andrey Filipenkov	24a5dd797c	fix starting local server	2022-09-24 15:55:21 +03:00
Andrey Filipenkov	de05479532	Revert "attempt to run server in a separate app" ... This reverts commit 99fe55b295ad95033626c15011cfe49779269156.	2022-09-24 15:55:21 +03:00