18375 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laserlicht	ac12574f61	fix picture (regression)	2024-11-15 03:25:16 +01:00
Joakim Thorén	9611a324cd	Fix linker error in EntryPoint if ffmpeg is missing due to missing DISABLE_VIDEO in vcmiclient target	2024-11-15 00:49:22 +01:00
Joakim Thorén	9a1e48c349	Set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER to gcc and g++ for windows-mingw-release preset. ... Prevents various situations where clang is chosen over gcc, which is unintended when using windows-mingw-release preset	2024-11-14 23:26:24 +01:00
Joakim Thorén	e7682cfd5c	Add qt5-tools and tbb as required dependencies when using the windows-mingw-release preset	2024-11-14 23:09:29 +01:00
Laserlicht	0f94f35dcf	code review	2024-11-14 00:34:39 +01:00
Laserlicht	1e77d08d1a	docs for modder	2024-11-13 23:49:57 +01:00
Laserlicht	a6c985c4f5	code review	2024-11-13 23:10:41 +01:00
Laserlicht	6199a13603	code review	2024-11-13 20:20:16 +01:00
Laserlicht	e73cb7f45b	Update client/windows/CCreatureWindow.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2024-11-13 20:03:20 +01:00
Ivan Savenko	7be44278d7	Merge pull request #4892 from SoundSSGood/artifact-related-fixes ... Artifact related fixes	2024-11-13 20:58:37 +02:00
Ivan Savenko	004b7892f2	Merge pull request #4889 from kdmcser/artifact_sort_fix ... crash fix: artifact sort by slot	2024-11-13 20:50:40 +02:00
Ivan Savenko	46e492be01	Merge pull request #4891 from kdmcser/fix_research_spell_crash ... fix spell research crash when no more spells can be researched	2024-11-13 20:50:24 +02:00
Ivan Savenko	1d0fdb1c0e	Merge pull request #4867 from Laserlicht/notFocusedClick ... notFocusedClick refactoring	2024-11-13 20:49:31 +02:00
SoundSSGood	27b59dd7ee	crash fixed	2024-11-13 06:39:37 +02:00
Xilmi	31d4517f17	Merge remote-tracking branch 'upstream/develop' into develop	2024-11-12 14:31:31 +01:00
Laserlicht	719859cc62	optimize	2024-11-12 00:12:56 +01:00
Laserlicht	e660d30b8a	hint	2024-11-11 23:55:07 +01:00
Laserlicht	33220b2eb3	check if used in mainmenu	2024-11-11 23:52:35 +01:00
Laserlicht	44561a55db	chronicles docs	2024-11-11 22:57:44 +01:00
Laserlicht	6b33f4d969	skip campaigns from set	2024-11-11 22:44:48 +01:00
Laserlicht	9c55ebf2dd	chronicles campaign screen	2024-11-11 22:25:54 +01:00
kdmcser	306c84572a	update Chinese translation	2024-11-11 21:03:25 +08:00
SoundSSGood	b32ec8607c	tradable grail	2024-11-10 21:48:54 +02:00
kdmcser	51e742f475	Merge branch 'develop' into fix_research_spell_crash	2024-11-10 23:32:33 +08:00
SoundSSGood	ea14760e6c	fix for fused artifacts creation	2024-11-10 17:06:39 +02:00
kdmcser	2621d4f5bf	fix spell research crash when no more spells can be researched due to map limit	2024-11-10 23:02:36 +08:00
SoundSSGood	ef46a87e69	ask assemble artifact dialog fix	2024-11-10 16:50:58 +02:00
Ivan Savenko	78da8c06df	Merge pull request #4871 from krs0/develop ... Reorder creature abilities to be more logical	2024-11-10 16:13:20 +02:00
krs	acb66648b1	Better names (HotA mod) for canShootWalls	2024-11-10 15:47:42 +02:00
krs	54f8f2c636	Remove CCreatureHandler::loadBonuses	2024-11-10 15:10:38 +02:00
kdmcser	77d14d095f	delete error message since grail will go to last branch	2024-11-10 10:52:00 +08:00
Laserlicht	23709ab217	support loading layer images	2024-11-09 21:04:20 +01:00
krs	1a5e99724a	Add Description for KING bonuses	2024-11-09 20:52:37 +02:00
krs	620ffe68f5	Add in creatures json configs all abilities that were implicit	2024-11-09 19:07:39 +02:00
krs	324fd57169	Reorder creature abilities to be more logical	2024-11-09 19:07:38 +02:00
Laserlicht	3872a3ea89	fix fallback scaling	2024-11-09 17:58:23 +01:00
Laserlicht	35e198078b	cleanup logic	2024-11-09 14:02:09 +01:00
Laserlicht	ac31a946e6	use path instead of different filename	2024-11-09 13:07:15 +01:00
kdmcser	e12b72a839	merge changes	2024-11-09 17:37:06 +08:00
kdmcser	5f4a5228ce	Merge branch 'develop' into artifact_sort_fix	2024-11-09 17:34:43 +08:00
kdmcser	8d58066f69	fix artifact sort by slot crash	2024-11-09 17:24:14 +08:00
kdmcser	17dd8ffb48	fix artifact sort by slot crash	2024-11-09 16:54:47 +08:00
Laserlicht	1f7cec3ae3	missing prescalefactor	2024-11-08 00:09:17 +01:00
Andrey Filipenkov	79f57b36f3	add Homebrew install option	2024-11-07 20:54:19 +03:00
Xilmi	2786797a4e	Fixed incompatibility with latest merge ... Incompatibility fix	2024-11-07 17:37:18 +01:00
Xilmi	e60a565942	Merge remote-tracking branch 'upstream/develop' into develop	2024-11-07 15:24:19 +01:00
Ivan Savenko	a40292e783	Merge pull request #4883 from IvanSavenko/modding_fixes ... Fixes for recently reported issues	2024-11-07 15:40:08 +02:00
Xilmi	a70f5de8c6	Merge remote-tracking branch 'upstream/develop' into develop	2024-11-07 14:35:13 +01:00
Ivan Savenko	733b1b339c	Remove broken automatic addition of dependency for wog maps	2024-11-07 12:08:28 +00:00
Ivan Savenko	c3c5f73a63	Restore save compatibility with 1.5	2024-11-07 12:08:08 +00:00