344 Commits

Author	SHA1	Message	Date
Ivan Savenko	7a09646009	Cleaned up dwelling randomization	2023-11-01 14:43:20 +02:00
Ivan Savenko	29a78c14a2	Merge pull request #3113 from Alexander-Wilms/develop ... Fix small issues	2023-10-30 11:02:28 +02:00
Andrii Danylchenko	b579ca8a33	#1912 trap, exception on adding duplicating hero	2023-10-29 11:03:37 +02:00
Alexander Wilms	a6db82f6f1	mapeditor/inspector/inspector.cpp: Directly assign to the "std::optional", without dereferencing it. ... Assigning to an optional should directly target the optiona	2023-10-28 10:16:33 +00:00
nordsoft	b6b75beb29	Fixes for map editor ... 1) fix owner serialization for hero placeholder 2) fix roads/rivers layout 3) fix lasso	2023-10-24 23:58:26 +02:00
Ivan Savenko	3880ea58b9	Merge branch 'josch/dos2unix' into develop	2023-10-22 18:39:03 +03:00
Ivan Savenko	3867e512f7	Merge pull request #3064 from IvanSavenko/bonus_metaidentifier ... Type-safe bonus system	2023-10-22 18:34:12 +03:00
Ivan Savenko	4f47555977	Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE	2023-10-22 16:55:19 +03:00
Ivan Savenko	ac925bb786	Renamed new types for consistency with code style	2023-10-22 16:55:19 +03:00
Ivan Savenko	b394158dc9	Bonus Source ID now uses metaidentifier	2023-10-22 16:55:18 +03:00
nordsoft	b9a660f6c3	Redesign map editor rendering	2023-10-20 01:25:06 +02:00
Nordsoft91	d03b75696a	Merge pull request #3067 from Nordsoft91/editor-improvements-1.4 ... Add hero placeholder properties	2023-10-19 22:23:58 +02:00
Johannes Schauer Marin Rodrigues	a1a5bc28c2	convert line endings from CRLF (Windows) to LF (Linux/Unix) ... Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073	2023-10-19 16:23:21 +02:00
Johannes Schauer Marin Rodrigues	f9e1b302c7	some spelling fixes	2023-10-18 01:41:02 +02:00
nordsoft	f6d7755c6a	Add hero placeholder properties	2023-10-16 22:24:12 +02:00
Nordsoft91	02c1425939	Merge pull request #3046 from Nordsoft91/editor-improvements-1.4 ... Add map editor zoom and objects lock functionality	2023-10-16 01:22:18 +02:00
nordsoft	4ab203eaae	Add more object search flexibility	2023-10-14 03:16:17 +02:00
nordsoft	788147a897	Add line and fill brushes	2023-10-14 02:58:13 +02:00
nordsoft	55900ceb66	Add portraits delegate	2023-10-13 20:15:29 +02:00
nordsoft	051886c98e	Add shurtcuts	2023-10-13 11:13:57 +02:00
nordsoft	d85c5189ba	Add object lock and zoom functinoality	2023-10-13 11:07:17 +02:00
nordsoft	006def7690	ui improvements	2023-10-13 11:07:17 +02:00
nordsoft	3199b7261f	Cosmetic fixes for map editor	2023-10-11 23:28:10 +02:00
nordsoft	7b7aaa36b2	fix compiling	2023-10-11 01:44:58 +02:00
nordsoft	5b10b457cf	Fix code review suggestions	2023-10-11 00:47:19 +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	335585bd11	Remove unused variable	2023-10-09 19:21:27 +02:00
nordsoft	e2b8c2e9f8	PickObject delegate for random dwellings	2023-10-09 01:24:00 +02:00
nordsoft	cfa1a6d880	Show coordinates on map	2023-10-08 20:25:59 +02:00
nordsoft	043f54698b	Fix translations in map editor / fix crash on game end	2023-10-05 23:34:29 +02:00
nordsoft	766f9cf19f	Mistake fix	2023-10-05 22:55:24 +02:00
nordsoft	189f790b44	Translations bugfixes	2023-10-05 22:54:28 +02:00
Ivan Savenko	b75a67ef7c	Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor ... Improvements to type safety of Identifier class	2023-10-05 00:33:07 +03:00
Fabrice Tiercelin	99221c2d56	Fix Chinese translation	2023-10-04 21:04:06 +02:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
nordsoft	65e63bdf69	Fix text duplicating	2023-10-01 14:04:46 +02:00
nordsoft	f6093a84f0	Add newline symbol	2023-10-01 14:00:08 +02:00
nordsoft	7d56b704a2	Fix events/rumors identifiers	2023-10-01 13:38:16 +02:00
nordsoft	9c5725da66	Convertion finished	2023-10-01 13:32:35 +02:00
nordsoft	4e5580f3d9	Fix typo	2023-10-01 02:39:03 +02:00
nordsoft	e9855de101	Layout fixes	2023-10-01 02:35:02 +02:00
nordsoft	cb02e221f3	Couple fixes	2023-09-30 04:33:41 +02:00
nordsoft	3018178956	Remember folder for images as well	2023-09-30 03:44:13 +02:00
nordsoft	53dadc6dc3	Add map converter	2023-09-30 03:42:29 +02:00
nordsoft	70796d232b	Full support of maps translations	2023-09-29 00:24:45 +02:00
nordsoft	ae073ee35d	Remove unused identifiers	2023-09-28 23:15:36 +02:00