5170 Commits

Author	SHA1	Message	Date
SoundSSGood	539b2e596d	adjusting the placement of artifact slots	2023-11-06 14:31:32 +02:00
SoundSSGood	75ebd954af	Creatures altar & Artifacts altar	2023-11-06 14:31:32 +02:00
SoundSSGood	9f9317a8a0	CTradeBase initial commit	2023-11-06 14:31:31 +02:00
SoundSSGood	fbe3e0fe12	CArtPlace preparation	2023-11-06 14:01:13 +02:00
Ivan Savenko	8dc5837395	Merge pull request #3144 from IvanSavenko/remove_identifier_implicit_int_conversion ... Remove (some of) implicit conversions of Identifier to integer	2023-11-04 19:36:11 +02:00
Ivan Savenko	5487f07d3b	added toEntity overload that accepts generic Services class	2023-11-04 17:04:53 +02:00
Andrii Danylchenko	a8cc5e1d60	Merge pull request #3140 from vcmi/fix-3003 ... #3003 - fix hypnotize	2023-11-04 10:50:58 +02:00
Ivan Savenko	184f5a72cc	Use toEntity/toXXX methods in Identifier instead VLC objects access	2023-11-03 16:03:29 +02:00
Ivan Savenko	8d5fa41a19	Minor fixes	2023-11-03 16:03:29 +02:00
Ivan Savenko	87f6c7354b	Merge pull request #3139 from IvanSavenko/component_variant_identifier ... Refactoring of Component class	2023-11-03 15:52:07 +02:00
Ivan Savenko	4a24da3804	Merge pull request #3114 from Laserlicht/fix-highscore ... fix high scores screen	2023-11-03 15:51:37 +02:00
Ivan Savenko	7a254dd55f	Merge pull request #3135 from IvanSavenko/file_corruption_check ... Ignore corrupted .def files	2023-11-03 15:49:43 +02:00
Andrii Danylchenko	3b27e07385	#3003 - fix hypnotize	2023-11-03 13:50:16 +02:00
Ivan Savenko	056ef00f74	Bugfixing	2023-11-02 13:52:58 +02:00
Ivan Savenko	10e50548e7	Converted Component class to use VariantIdentifier instead of int	2023-11-02 12:00:04 +02:00
Ivan Savenko	0376873cb3	Merge pull request #3125 from IvanSavenko/reduce_subid_usage ... Reduce usage of CGObjectInstance::subID	2023-11-02 11:58:01 +02:00
Andrii Danylchenko	5cd16e5b27	Merge pull request #3124 from vcmi/fix-2977 ... #2977 - fix obstackle path deserialization	2023-11-01 15:27:14 +02:00
Ivan Savenko	8346d71c98	Remove more subID access	2023-11-01 14:44:05 +02:00
Ivan Savenko	7107b3202f	Merge pull request #3069 from SoundSSGood/artifact-location-id ... ArtifactLocation now use ID for artHolder identification	2023-11-01 14:41:36 +02:00
Laserlicht	8a9f10ec3a	fix asset failures	2023-10-31 22:05:22 +01:00
Ivan Savenko	858ba22a27	Ignore corrupted .def files	2023-10-31 12:11:41 +02:00
SoundSSGood	c2f658d638	Bulk move artifacts. id	2023-10-29 17:46:13 +02:00
SoundSSGood	3c5527a222	ArtifactLocation now use ID for artHolder identification part3	2023-10-29 17:46:13 +02:00
SoundSSGood	ab2f6abb87	ArtifactLocation now use ID for artHolder identification part2	2023-10-29 17:46:13 +02:00
SoundSSGood	61fc236d79	ArtifactLocation now use ID for artHolder identification part1	2023-10-29 17:46:13 +02:00
Andrii Danylchenko	73b89d4e84	#2977 - fix obstackle path deserialization	2023-10-29 16:07:00 +02:00
Alexander Wilms	5cbc75d3b7	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
Alexander Wilms	e677164ed0	client/widgets/Buttons.h: Fix const reference ... Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>	2023-10-29 13:34:19 +00:00
Alexander Wilms	5d7b83c10b	client/widgets/Buttons.cpp: Fix const reference ... Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>	2023-10-29 13:34:19 +00:00
Alexander Wilms	466cdb9d2b	client/widgetsImages.{h,cpp}: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char')	2023-10-29 13:34:19 +00:00
Alexander Wilms	f1bb6b999c	client/widgets/Buttons.{h,cpp}: Pass expensive to copy object "callback" by reference to const.	2023-10-29 13:33:57 +00:00
Ivan Savenko	0169c65937	Merge pull request #3100 from IvanSavenko/split_net_packs ... Split netpacks.h into multiple files	2023-10-29 13:46:40 +02:00
Alexander Wilms	e4db6f2af8	CClient::removeGUI(): This function should be declared 'const'	2023-10-28 23:05:05 +00:00
Alexander Wilms	bb04ca46b5	client/NetPacksClient.cpp: Combine null pointer checks ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-27 23:43:39 +00:00
Alexander Wilms	92bab6dd08	client/NetPacksClient.cpp: Combine null pointer checks ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-27 23:43:39 +00:00
Alexander Wilms	d2c03773cd	client/NetpacksClient.cpp: Called C++ object pointer is null ... Null pointers should not be dereferenced	2023-10-27 23:43:39 +00:00
Alexander Wilms	ead1140b9b	client/icons/generate_icns.py: Replace print statement by built-in function. ... The "print" statement should not be used	2023-10-27 23:34:11 +00:00
Alexander Wilms	10ad5b6789	client/windows/CCastleInterface.cpp: Identical sub-expressions on both sides of operator "&&". ... Identical expressions should not be used on both sides of a binary operator	2023-10-27 18:19:17 +00:00
Alexander Wilms	f01ec55d21	Use the "nullptr" literal. ... "nullptr" should be used to denote the null pointer	2023-10-27 18:18:59 +00:00
Laserlicht	c1707bcc71	fix datatype	2023-10-27 18:52:25 +02:00
Alexander Wilms	3616235bb5	FramerateManager.cpp: Merge this "if" statement with the enclosing one. ... Collapsible "if" statements should be merged	2023-10-27 14:30:04 +00:00
Nordsoft91	8f2b50a5e2	Merge pull request #3095 from Laserlicht/team_alignment ... fix team alignments	2023-10-26 23:19:18 +02:00
Laserlicht	e28d14d16d	not needed anymore	2023-10-24 18:56:30 +02:00
Laserlicht	abb279f5b4	use config	2023-10-24 18:51:58 +02:00
Ivan Savenko	5523f05284	Moved ArtifactLocation to a separate file	2023-10-23 19:02:28 +03:00
Ivan Savenko	b88a8da4e8	Split off some netpack structures into separate files	2023-10-23 13:59:15 +03: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	a70ad7202f	Merge pull request #3088 from Laserlicht/non_squared ... Minimap keep aspect ratio (Letterboxing)	2023-10-22 16:55:58 +03:00
Ivan Savenko	ac925bb786	Renamed new types for consistency with code style	2023-10-22 16:55:19 +03:00