8669 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrey Filipenkov	7dcd910877	add Linux icons for the map editor ... Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>	2022-10-22 23:03:01 +03:00
Andrey Filipenkov	278e6bedeb	[Linux] add proper desktop entry for the map editor	2022-10-22 17:08:55 +03:00
Andrii Danylchenko	b43e0ff9e4	Merge pull request #972 from vcmi/cpp-map-editor ... Cpp map editor	2022-10-22 12:42:27 +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
Andrii Danylchenko	bae4750e93	Merge pull request #1078 from Nordsoft91/advspell-mech-fix ... [1072] Fix advmap spell mechanics	2022-10-22 12:30:34 +03:00
Andrii Danylchenko	91dc94c66b	Merge pull request #1079 from Nordsoft91/fix-screenshots-param ... Fix screenshots loading	2022-10-22 12:30:15 +03:00
nordsoft	2409bdfbda	Fix screenshots loading	2022-10-21 04:03:54 +04:00
nordsoft	750f160276	Fix advmap spell mechanics	2022-10-20 22:34:27 +04:00
Andrii Danylchenko	c32d44190e	Merge pull request #1075 from Nordsoft91/town-entrance-fix ... [1069] Fix bug related to town entrance	2022-10-19 13:42:33 +03:00
Andrii Danylchenko	288f36c0c3	Merge pull request #1052 from Nordsoft91/mp-disconnection ... MP handle disconnection	2022-10-19 09:56:18 +03:00
nordsoft	7bcb318593	Fix bug related to town entrance	2022-10-19 02:54:06 +04:00
nordsoft	0adae7bb0d	Revert "Fix crash for disconnecting client" ... This reverts commit 28ab1e9777.	2022-10-19 00:14:16 +04:00
Andrey Filipenkov	36e5fff1f3	update gitignore	2022-10-18 20:50:38 +03:00
Andrey Filipenkov	bf897311d9	[macOS] don't fail if macdeployqt is missing ... - it's needed only at install time (when creating dmg) - ConanCenter binaries don't have it	2022-10-18 20:50:38 +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	494e2c2c92	[CI] use specific GitHub release for macOS dependencies	2022-10-18 20:50:38 +03:00
Andrey Filipenkov	524ad5ab76	[CI] build iOS with Conan	2022-10-18 20:50:38 +03:00
Andrey Filipenkov	73b0b7c8a3	[Conan] add docs	2022-10-18 20:50:37 +03:00
Andrey Filipenkov	c1ef07a5e4	[Conan] generate all configs by default ... env var change: USE_CONAN_WITH_ALL_CONFIGS -> GENERATE_ONLY_BUILT_CONFIG	2022-10-18 10:12:05 +03:00
Andrey Filipenkov	cf34c8da56	[Conan] add option to use Apple system libraries as overrides	2022-10-18 10:11:37 +03:00
nordsoft	fe942902df	Fix road bug	2022-10-17 02:23:26 +04:00
nordsoft	d5403d3eb9	Merge remote-tracking branch 'upstream/develop' into cpp-map-editor	2022-10-17 01:39:11 +04:00
nordsoft	9ead21326a	Partially implement seerhuts	2022-10-17 01:16:27 +04:00
nordsoft	d9819d3a20	Attempt to fix compilation	2022-10-16 15:37:01 +04:00
Andrey Filipenkov	1e8be46ced	[Conan] use semver	2022-10-16 13:25:38 +03:00
Andrey Filipenkov	3a0d11b38a	[Conan] add option to use default options of dependencies ... this allows consuming prebuilt binaries from CCI name: default_options_of_requirements	2022-10-16 13:25:38 +03:00
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