13398 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laserlicht	d5b16ac96c	rename	2023-10-16 01:43:50 +02:00
Laserlicht	f3262a47c0	Update client/adventureMap/CList.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-16 01:42:01 +02:00
Laserlicht	aeb559efb8	code review	2023-10-16 00:04:29 +02:00
Laserlicht	4528f42cdf	fix segmentation fault; update townlist on adventuremap	2023-10-15 15:53:19 +02:00
Laserlicht	3b853bff08	sort town feature	2023-10-15 14:31:33 +02:00
Ivan Savenko	e052a96637	Merge pull request #3054 from Alexander-Wilms/ci-cleanup ... Move JSON validation script to CI folder	2023-10-15 12:48:03 +03:00
Nordsoft91	3906217ef5	Merge pull request #3049 from Warzyw647/fix-morale-chance-lookup ... Fixed morale and luck chance lookup.	2023-10-14 21:39:57 +02:00
Nordsoft91	aa25ab6488	Merge pull request #3035 from Nordsoft91/quests ... Quests rework	2023-10-14 21:38:15 +02:00
Alexander Wilms	5c0c317691	Move JSON validation script to CI folder	2023-10-14 14:22:50 +00:00
nordsoft	4651893b48	Fix hota quests	2023-10-14 00:15:15 +02:00
nordsoft	5f52e6b35e	Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30" ... This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.	2023-10-13 23:35:37 +02:00
Warzyw647	8058efb3bd	Fixed morale and luck chance lookup.	2023-10-13 20:43:15 +02:00
nordsoft	2bf8cdc9f5	Hota-related bugs were fixed	2023-10-13 12:52:45 +02:00
Nordsoft91	802e1bb961	Merge pull request #3042 from Laserlicht/crash_preview ... [fix] crash with custom campaign preview	2023-10-13 10:57:02 +02:00
Nordsoft91	093c8149e5	Merge pull request #3040 from Laserlicht/infobox_next	2023-10-13 10:38:32 +02:00
Nordsoft91	ab36692847	Merge pull request #3037 from Laserlicht/missing_res	2023-10-13 10:36:33 +02:00
nordsoft	9108f7e3e5	Remove assert triggered while flying	2023-10-12 13:40:28 +02:00
nordsoft	fadf086e61	Fix review comments	2023-10-12 13:30:01 +02:00
nordsoft	fbf5492fd9	Remove unnecessary virtuals	2023-10-12 13:30:01 +02:00
nordsoft	74a90cde5d	Fix hero level limiter	2023-10-12 12:52:01 +02:00
Nordsoft91	4ae123e2a1	Merge pull request #3038 from Alexander-Wilms/connection-error-window ... Show info dialog when connection to multiplayer server fails	2023-10-12 00:16:04 +02:00
nordsoft	3199b7261f	Cosmetic fixes for map editor	2023-10-11 23:28:10 +02:00
nordsoft	14b030d2eb	Support hota quest gates	2023-10-11 23:15:24 +02:00
nordsoft	7ccd4cdcb2	Refactor quests progress	2023-10-11 21:10:42 +02:00
Alexander Wilms	8d1b5e24dd	Add russian translation for connection error message	2023-10-11 18:49:47 +02:00
Nordsoft91	ecd01fd53c	Merge pull request #3039 from Laserlicht/townhall_click	2023-10-11 18:43:59 +02:00
Laserlicht	abab917ef9	fix crash with custom campaign preview	2023-10-11 11:23:38 +02:00
nordsoft	22c9eecd7d	Fix mistake	2023-10-11 08:54:54 +02:00
nordsoft	7b7aaa36b2	fix compiling	2023-10-11 01:44:58 +02:00
nordsoft	2b88e6941c	Fix mana limiter	2023-10-11 01:43:24 +02:00
nordsoft	6093f042dd	Text container fix	2023-10-11 01:26:07 +02:00
nordsoft	8335fffaea	Fix rumors	2023-10-11 00:58:32 +02:00
nordsoft	5b10b457cf	Fix code review suggestions	2023-10-11 00:47:19 +02:00
Laserlicht	f9db3d131f	lastActivated with overload	2023-10-10 23:51:05 +02:00
nordsoft	62c4e8a98d	Fix compiling	2023-10-10 23:44:29 +02:00
nordsoft	31d71ddd25	Minor fixes in text	2023-10-10 23:44:29 +02:00
nordsoft	5eeda3cd25	Quests mostly work	2023-10-10 23:44:29 +02:00
nordsoft	d2d64dbddd	Bugfixes	2023-10-10 23:44:29 +02:00
nordsoft	bb238f9b72	New quests work	2023-10-10 23:44:29 +02:00
nordsoft	63bdfb8ff6	New quests implemented	2023-10-10 23:44:29 +02:00
nordsoft	3a17eeb330	Fix typos in rewards widget	2023-10-10 23:44:29 +02:00
nordsoft	1460541ee5	New limiter based quests	2023-10-10 23:44:29 +02:00
nordsoft	b7568a160c	Fixes	2023-10-10 23:44:29 +02:00
nordsoft	6a7b23c007	Additional properties for limiter	2023-10-10 23:44:28 +02:00
nordsoft	937a8d63c7	Check for artifacts copies in limiter	2023-10-10 23:44:28 +02:00
nordsoft	0cf3205e15	Fix quest regressions	2023-10-10 23:44:28 +02:00
Nordsoft91	3f3c079c0e	Merge pull request #3032 from Nordsoft91/editor-improvements-1.4 ... Random dwellings can be connected to town types	2023-10-10 23:42:18 +02:00
Nordsoft91	773fb965ba	Merge pull request #3028 from Nordsoft91/fixes ... Fix campaign advance crash	2023-10-10 23:41:52 +02:00
Nordsoft91	25952f8223	Merge pull request #3027 from Nordsoft91/turn-timer ... Add game pause	2023-10-10 23:41:36 +02:00
Laserlicht	8a3e58cd5e	red is the most liked color	2023-10-10 23:15:40 +02:00