3110 Commits

Author	SHA1	Message	Date
nordsoft	915d215076	Fix connections amount problem	2022-11-15 22:09:47 +04:00
nordsoft	e7a8466e2b	Merge remote-tracking branch 'upstream/develop' into lobby	2022-11-15 22:09:46 +04:00
Andrii Danylchenko	6974d4ea53	Merge pull request #1130 from IvanSavenko/banned_skills_fix ... Fixes #1096 - do not propose banned skills on levelup	2022-11-15 09:32:12 +02:00
Andrii Danylchenko	8b964be71f	Merge pull request #1111 from GermanAizek/develop ... Code refactor and fix condition bug	2022-11-15 09:23:16 +02:00
lainon	7fdad4e0f6	Code refactor following C++ standard and condition fixes	2022-11-15 03:20:55 +03:00
Ivan Savenko	729357824b	Added common method for secondary skill availability checks	2022-11-14 19:08:49 +02:00
Andrii Danylchenko	b6bcfec329	Merge pull request #1129 from IvanSavenko/new_day_sound_fix ... Fixes #825 - do not wait for new week dialog in single-player	2022-11-14 17:45:57 +02:00
Ivan Savenko	4fe8ff9b01	Fixes #825 - do not wait for new week dialog in single-player	2022-11-14 15:53:07 +02:00
Andrii Danylchenko	86972d7164	Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2 ... Bulk move and swap artifacts rev2	2022-11-14 08:31:48 +02:00
Andrii Danylchenko	38f36fa720	Merge pull request #1127 from IvanSavenko/resume_music ... Fix #985 - resume town & terrain themes	2022-11-13 21:18:46 +02:00
Ivan Savenko	2324148187	Fix compilation using older SDL library	2022-11-13 14:59:28 +02:00
Ivan Savenko	38b8fc0af8	Formatting: space -> tabs	2022-11-13 14:24:15 +02:00
Ivan Savenko	4af9bc2461	Music: remember playback position of music tracks ... Town & terrain themes will now resume from previously stopped position instead of playing from start, as it was in original game. Fixes #965	2022-11-13 14:05:51 +02:00
Andrii Danylchenko	41825e8c92	Merge pull request #1125 from GermanAizek/fix-3144 ... Fix [3144]	2022-11-13 09:00:03 +02:00
lainon	79bc82af63	Fix [3144]	2022-11-13 05:35:16 +03:00
nordsoft	56757bb5c2	Pass port from client to server for ios	2022-11-11 18:35:40 +04:00
nordsoft	eeeca5ba8d	Add additional logging	2022-11-11 18:00:09 +04:00
SoundSSGood	3142f32cbb	Fix for callback return. More code optimization	2022-11-11 01:28:04 +02:00
SoundSSGood	9647758812	Apply suggested changes next part	2022-11-10 23:24:41 +02:00
SoundSSGood	6e5932c016	Apply suggested changes next part	2022-11-10 21:02:06 +02:00
SoundSSGood	ad47a7573c	Code style. Typo. Code clean up.	2022-11-10 18:29:39 +02:00
nordsoft	8871c7abbd	Attempt to fix ios build	2022-11-10 16:02:11 +04:00
nordsoft	6406157038	Attempt to fix ios build	2022-11-10 14:53:12 +04:00
nordsoft	0ad06af593	Attempt to fix ios build	2022-11-10 14:08:19 +04:00
nordsoft	b3aa87fe10	Attemp to fix ios build	2022-11-10 12:48:17 +04:00
nordsoft	16ab5f9e02	Revert "Attempt to fix ios build" ... This reverts commit eab8abef67c51f80cb95ab9b3fd15ab203527854.	2022-11-10 05:14:19 +04:00
nordsoft	eab8abef67	Attempt to fix ios build	2022-11-10 04:27:26 +04:00
nordsoft	9ffc50457a	Bypass command line args to vcmiserver	2022-11-08 18:05:47 +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
SoundSSGood	ff63167553	warnings fixed	2022-11-07 18:31:22 +02:00
SoundSSGood	3a3b559a0b	attempt to fix the build	2022-11-07 14:20:28 +02:00
SoundSSGood	203c54e956	BulkMoveArtifacts structure optimization	2022-11-07 14:13:36 +02:00
nordsoft	7b6d9c23b3	Attempt to pass lobby parameters as command line arguments	2022-11-07 13:44:58 +04:00
SoundSSGood	0032947735	regression fixed. Artifact assemble dialog shows multiple times.	2022-11-07 00:36:13 +02:00
SoundSSGood	f72a3e3884	function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder	2022-11-07 00:18:05 +02:00
SoundSSGood	95ab343116	Net Packs BulkMoveArtifacts structure and BulkMoveArtifacts::applyCl	2022-11-06 23:54:50 +02:00
SoundSSGood	d0895e30ef	callback functions and cleaning up unused code	2022-11-06 23:41:29 +02:00
nordsoft	0eb74b85c9	Merge remote-tracking branch 'upstream/develop' into lobby	2022-11-07 00:23:20 +04:00
nordsoft	dffd7c0f24	Fix crash related to V hotkey during AI turn	2022-11-04 18:29:45 +04:00
nordsoft	6995911d6e	Preventing multiple AI from being created	2022-11-03 22:01:20 +04:00
nordsoft	e21c2a02ce	Merge remote-tracking branch 'upstream/develop' into lobby	2022-11-02 18:33:33 +04:00
nordsoft	52b3b329a4	Fix [965]	2022-11-01 19:16:45 +04:00
nordsoft	1c84cc4521	Merge remote-tracking branch 'upstream/develop' into lobby	2022-11-01 16:30:27 +04:00
nordsoft	27bff89e66	Write port override	2022-10-30 19:59:43 +04:00
nordsoft	dd45d1a9cf	Develop game part	2022-10-25 05:27:53 +04: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
Andrii Danylchenko	288f36c0c3	Merge pull request #1052 from Nordsoft91/mp-disconnection ... MP handle disconnection	2022-10-19 09:56:18 +03:00
Andrey Filipenkov	409ab51036	[iOS] workaround having TBB symlink in NullkillerAI’s RPATH ... AltStore doesn't sign symlinks	2022-10-18 20:50:38 +03:00
Andrey Filipenkov	f10e5e3b99	[Conan] add iOS support	2022-10-16 13:25:38 +03:00