8893 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrey Filipenkov	77d0fa8659	[Conan] add options to control usage of FFmpeg and LuaJIT	2022-10-16 13:25:38 +03:00
Andrey Filipenkov	d0d4049158	[Conan] remove no longer needed Boost workaround	2022-10-16 13:25:38 +03:00
Andrey Filipenkov	f10e5e3b99	[Conan] add iOS support	2022-10-16 13:25:38 +03:00
nordsoft	5bac36ba38	Attempt to fix compilation	2022-10-16 14:22:34 +04:00
nordsoft	4b0815d9db	Attempt to fix compilation	2022-10-16 13:49:47 +04:00
Andrii Danylchenko	43db37bf45	Merge pull request #1068 from vcmi/nk-retreat ... NKAI retreat	2022-10-16 11:57:28 +03:00
nordsoft	3de6569dab	Fix rewards nullptr bug	2022-10-16 03:42:21 +04:00
nordsoft	cd28a0791b	Fix rewards bug	2022-10-16 03:26:19 +04:00
nordsoft	dd463ca95a	Add seerhut rewards	2022-10-16 03:20:24 +04:00
nordsoft	36b87689f9	Enable editor for 32bit platform	2022-10-16 00:20:21 +04:00
Andrii Danylchenko	e9c725181c	NKAI: fix retreat logic	2022-10-15 15:15:12 +03:00
Andrey Filipenkov	233997d18d	[Conan] upgrade dependencies: Boost, FFmpeg, Qt, SDL, libpng	2022-10-14 16:51:11 +03:00
Andrii Danylchenko	153cccdf46	NKAI: hire retreated hero	2022-10-14 12:00:56 +03:00
Andrii Danylchenko	82a9f82e1c	BattleAI: retreat	2022-10-14 12:00:56 +03:00
Andrii Danylchenko	e2b373a784	Merge pull request #1066 from vcmi/fix-random-hero-initial-pos ... #1065 - fix random hero initial position	2022-10-14 11:57:43 +03:00
Andrey Filipenkov	8bf33790b8	[Conan] use Ninja by default	2022-10-13 13:24:25 +03:00
Andrii Danylchenko	6cbaa40e29	#1065 - fix random hero initial position	2022-10-13 11:58:32 +03:00
nordsoft	29b2a81442	Fix compilation	2022-10-13 01:58:49 +04:00
nordsoft	b4a806d7fa	Code polishing	2022-10-13 01:51:55 +04:00
nordsoft	d7de9accee	Fix code review problems	2022-10-13 01:40:52 +04:00
nordsoft	297f518eb0	Code review tweaks	2022-10-13 00:18:15 +04:00
Andrey Filipenkov	b29229a577	fix showing logs path in Launcher	2022-10-09 17:42:33 +03:00
Andrii Danylchenko	360f079bb7	Merge pull request #1017 from vcmi/fix-mine-templates ... Fix incorrect templates for mines in HoTA	2022-10-09 11:25:59 +03:00
nordsoft	d3d1306ef0	Address part of feedback	2022-10-09 00:32:02 +04:00
nordsoft	5743310aec	Revert settings.json	2022-10-09 00:13:39 +04:00
nordsoft	2eb49315f5	Fix terrains/roads/rivers after code synch	2022-10-09 00:11:29 +04:00
nordsoft	6d92a66fea	Fix compilation with latest develop	2022-10-08 23:54:45 +04:00
nordsoft	4cb31ea912	Merge remote-tracking branch 'upstream/develop' into cpp-map-editor	2022-10-08 23:24:57 +04:00
Nordsoft91	23f80c58dc	Apply suggestions from code review ... Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>	2022-10-08 22:55:15 +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
Nordsoft91	64a801004c	Apply suggestions from code review ... Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>	2022-10-08 19:41:38 +04:00
Tomasz Zieliński	8c481dff46	Fix incorrect templates for mines in HoTA	2022-10-08 12:42:10 +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
nordsoft	e718f7fe39	Fix reconnection	2022-10-06 19:23:34 +04:00
Andrii Danylchenko	8b1a2a3ff3	Merge pull request #1039 from Nordsoft91/modinfo-from-json ... Modinfo from json	2022-10-06 17:11:08 +03:00
nordsoft	ea49b8cf40	Cleanup code	2022-10-06 17:56:54 +04:00
nordsoft	16e185343a	Add host commands to control game	2022-10-06 15:54:46 +04:00
nordsoft	895ec2d302	Make console available during other players' turn	2022-10-05 19:04:51 +04:00
Andrii Danylchenko	14b21df939	Merge pull request #1056 from vcmi/fix-1054 ... #1054 - fix crash and UI	2022-10-05 09:02:14 +03: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
Andrii Danylchenko	b83a40db87	#1054 - fix crash and UI	2022-10-04 21:54:14 +03:00
nordsoft	930f03e812	uuid check	2022-10-04 20:54:40 +04:00
nordsoft	83f4a5b561	Use host and port from config	2022-10-04 18:45:54 +04:00
nordsoft	a9ad583158	Restore AI controlled player for client disconnection	2022-10-04 18:11:12 +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
Andrii Danylchenko	33e5e51102	Merge pull request #1040 from vcmi/nkai-namespace ... NKAI: namespace	2022-10-04 15:56:48 +03:00
Andrii Danylchenko	300d98aac0	Merge pull request #1050 from josch/core.zip ... vcmibuilder: remove references to deprecated (and disabled) core.zip download	2022-10-04 12:53:14 +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