287 Commits

Author	SHA1	Message	Date
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	e57f8742cd	Rename ambiguos 'clear' to 'clearSlots' ... A lot of map objects inherit from CCreatureSet and as result - get clean() method that resets object army	2023-08-07 19:13:02 +03:00
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Dydzio	915283e126	Update polish translations	2023-08-02 21:10:09 +02:00
heroesiiifan	a7fab1099c	Mapeditor translation german update	2023-07-30 20:10:38 +00:00
Ivan Savenko	62fddca21e	Split massive CModHandler class/file into multiple parts: ... - IdentifierStorage is now a separate handler in VLC - Renamed ModHandler::Incompatibility exception to ModIncompatibility - Extracted ModScope namespace from ModHandler - Extracted ModUtilities namespace from ModHandler - Split CModHandler.cpp on per-class basis - Replaced some direct members with unique_ptr to reduce header includes	2023-07-30 22:17:47 +03:00
Ivan Savenko	593b82d178	Removed all references to boost::interprocess library	2023-07-30 20:14:57 +03:00
Ivan Savenko	4d08a131d3	Reorganization of boost filesystem usage ... - Removed (most of) boost filesystem namespace usings - Replaced boost::filesystem::fstream with std::fstream and different constructor that should be available on any plaftorm	2023-07-28 19:12:04 +03:00
Ivan Savenko	21a39f0b01	Removed boost::iostreams in favor of std::stream / boost::filesystem	2023-07-28 19:12:04 +03:00
Ivan Savenko	b52a21f8ee	Regenerated map editor translations to include missing strings	2023-07-28 13:42:53 +03:00
Ivan Savenko	4ba6806a69	Added missing string to Editor translation	2023-07-28 13:42:53 +03:00
Michael	d1f50033c6	German update Lanucher & Mapeditor	2023-07-23 15:56:12 +02:00
Tomasz Zieliński	ad5081f9fe	Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps	2023-07-19 12:05:30 +02:00
Fabrice Tiercelin	10793956e0	Mod list view translations	2023-07-17 20:08:05 +02:00
Tomasz Zieliński	025b0814c8	+ Handled banning spells and artifacts ... + Rename allowedSpell => allowedSpells	2023-07-17 17:21:28 +02:00
Ivan Savenko	9acab48bc3	Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework ... CArtifact CArtifactInstance refactoring	2023-07-11 14:36:08 +03:00
Ivan Savenko	695cae30de	Merge pull request #2300 from dydzio0614/update-translations-2 ... Launcher & map editor polish translations	2023-07-11 14:35:55 +03:00
Fabrice Tiercelin	2c7ee12c7f	Missing validation translations	2023-07-08 20:01:44 +02:00
Dydzio	871f59b12f	Launcher & map editor translations	2023-07-08 16:15:24 +02:00
Fabrice Tiercelin	8b96f8bab4	French in-game captions	2023-07-07 07:36:44 +02:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
Fabrice Tiercelin	a0ee0116f7	French map editor	2023-07-01 11:28:49 +02:00
Ivan Savenko	85262cf4f5	Moved CGameState files into a separate directory	2023-06-26 17:15:59 +03:00
Ivan Savenko	738ace99cb	Fix animations in editor which use copy-pasted code from client	2023-06-20 19:37:27 +03:00
Ivan Savenko	d51fe62804	Win/loss condition texts use MetaString	2023-06-20 19:37:27 +03:00
Ivan Savenko	c43783db58	Use string ID's instead of raw strings for win/loss conditions	2023-06-20 19:37:27 +03:00
Ivan Savenko	6f743916db	Moved CGCreature to a new file	2023-06-20 19:37:27 +03:00
Ivan Savenko	1e9eea30e1	Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop	2023-06-05 18:53:17 +03:00
Ivan Savenko	8d278e653f	Merge pull request #2202 from IvanSavenko/map_objects_reorganization ... Map objects code reorganization	2023-06-05 18:35:05 +03:00
Ivan Savenko	d6a357fd17	Split some map object files into smaller files. Reduced includes usage.	2023-06-02 21:47:37 +03:00
Ivan Savenko	8ea0ecaec1	show/showAll methods now use Canvas instead of SDL_Surface ... - added compatibility method to Canvas to allow SDL_Surface access - added drawBorder method to Canvas to replace CSDL_Ext method - added drawColor method to Canvas to replace CSDL_Ext method - minor changes to Tavern and Trade windows to adapt to new API	2023-06-02 16:42:18 +03:00
Ivan Savenko	acac42291e	Remove excessive CMap.h includes	2023-05-31 23:18:38 +03:00
Ivan Savenko	62595cb039	Split massive CMap.h a bit	2023-05-31 23:01:57 +03:00
Tomasz Zieliński	67c0fbc240	Merge remote-tracking branch 'origin/develop' into parellel_rmg ... # Conflicts: # lib/rmg/modificators/WaterProxy.cpp	2023-05-20 11:59:39 +02:00
Tomasz Zieliński	ccaece9d71	Refactor mapController to use precalculated obstacle set.	2023-05-20 10:57:05 +02:00
Tomasz Zieliński	cf0515dcd3	Moved Modificators to separate folder	2023-05-20 10:17:37 +02:00
Tomasz Zieliński	73d9f5bd0a	Parallel RMG works fine for maps without water.	2023-05-19 20:30:15 +02:00
SoundSSGood	1175990724	fixup	2023-05-19 01:55:11 +03:00
Ivan Savenko	a015bf6507	Initial part of dynamically-sized adventure map: ... - removed no longer used CConfigHandler - remove no longer use resolutions.json - moved widget management from adventure map to a separate class - adventure map layout is now loaded from config	2023-05-09 13:10:33 +03:00
nordsoft	a507a4c1ec	Remove deprecated objects from map editor	2023-05-01 21:49:37 +04:00
nordsoft	51a261b449	Auto-adjust size	2023-04-30 12:49:45 +04:00
nordsoft	e8a8e893ee	Export grabs whole map	2023-04-30 12:49:45 +04:00
nordsoft	dee235ea19	Implement map export to image	2023-04-30 12:49:45 +04:00
nordsoft	9aaa8c0d89	Fix teams switching	2023-04-30 12:49:45 +04:00
nordsoft	1de9a57a76	Add validation for hero duplicate	2023-04-30 12:49:45 +04:00
nordsoft	bab84309a5	Support teams in map editor	2023-04-30 12:49:45 +04:00
nordsoft	1899dd97c7	Customize colors and teams	2023-04-30 12:49:45 +04:00
Nordsoft91	f39f208e05	Merge pull request #1915 from Nordsoft91/vcmi-campaign ... VCMI campaigns format	2023-04-23 19:09:59 +04:00
nordsoft	9ecf16ca23	Fix minor bugs	2023-04-20 03:20:00 +04:00
Necr0o0	ee12685748	Fixed #2022 storing event in map editor ... Fixing issue "Event message isn't stored #2022" by adding message in Pandora setProperty ( cause CGEvent inherits CGPandoraBox)	2023-04-19 17:19:09 +04:00
Ivan Savenko	4bb4d7e7a5	Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 ... Artifact related code refactoring part1 (initial)	2023-04-19 15:31:11 +03:00
nordsoft	80220fda5b	Merge remote-tracking branch 'upstream/develop' into vcmi-campaign ... # Conflicts: # lib/mapping/CMap.h	2023-04-17 04:54:57 +04:00
nordsoft	e4c147db16	Add mod management into map editor	2023-04-17 03:01:29 +04:00
Ivan Savenko	3738171b21	Refactoring of H3M loader to make HotA format support easier ... - extracted low-level reader from MapFormatH3M class - added separate structure to define version-specific values - cleared up some H3M format edge cases - replaced witch hut skill vector with set - converted several fields to enum type	2023-04-15 17:20:38 +03:00
SoundSSGood	9a838598a6	arts refactoring part1	2023-04-15 00:10:39 +03:00
nordsoft	94c6c0c262	Add hero limit checkbox in map editor	2023-04-12 02:13:53 +04:00
Ivan Savenko	79b7659097	Fix gcc build	2023-04-12 01:04:27 +03:00
Ivan Savenko	63b197b78a	Converted attributes to use c++17 functionality	2023-04-12 01:03:14 +03:00
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
Konstantin	fedf7d377c	vcmi: remove TFaction ... This is a huge change and will break save compatibility	2023-04-10 19:28:16 +03:00
Ivan Savenko	5046f916d6	Fix filtering of objects by terrain in editor	2023-04-10 14:33:53 +03:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Konstantin	22dd97ad18	vcmi: use entilites when possible part 1	2023-04-04 23:02:54 +03:00
Ivan Savenko	6518e04cd6	Merge pull request #1849 from Nordsoft91/editor-1537 ... Allow single player on map and fix player params initialization	2023-04-04 11:25:11 +03:00
Ivan Savenko	c661419897	Merge pull request #1700 from rilian-la-te/resource-array ... Modernize resourceSet.	2023-04-02 20:12:45 +03:00
nordsoft	eedd7979aa	Allow single player on map and fix player params initialization	2023-04-02 14:31:57 +04:00
Konstantin	6d17b9342d	ResourceSet: resolve .at troubles	2023-03-31 14:12:38 +03:00
Andrey Filipenkov	8f638e7ca6	[editor] fix Player Settings crash when random town is added to a map ... fixes #1714	2023-03-20 11:35:19 +03:00
Ivan Savenko	921c5d647e	Fix Spanish translation	2023-03-16 18:42:47 +02:00
Ivan Savenko	35aa6914c5	Merge pull request #1659 from macomarivas/spanish_translation ... Spanish translation	2023-03-16 15:37:23 +02:00
Asirome	87f4a93b6b	spanish map translation	2023-03-15 20:47:53 +01:00
Ivan Savenko	369e925af8	Loading of translation mods is now skipped on language mismatch	2023-03-14 16:02:16 +02:00
Ivan Savenko	b1d2a2e74f	Updated translations	2023-03-14 16:02:16 +02:00
Ivan Savenko	0ea73cae7f	Merge pull request #1662 from rilian-la-te/reduce-lexical-cast ... vcmi: reduce boost::lexical_cast usage	2023-03-10 12:53:21 +02:00
Ivan Savenko	1ab0295bfb	Merge pull request #1630 from Nordsoft91/fix-1605 ... Regression fix for roads in map editor	2023-03-09 15:53:18 +02:00
Konstantin	5366f9190e	vcmi: reduce boost::lexical_cast usage	2023-03-09 16:36:46 +03:00
nordsoft	1451614cf2	Fix erase shortcut	2023-03-06 19:54:13 +04:00
Ivan Savenko	7ef5163d9d	Merge pull request #1581 from IvanSavenko/map_render_rewrite ... Adventure Map - rendering rewrite	2023-03-05 19:51:07 +02:00
Ivan Savenko	387a7b421a	Refactoring of new code, multiple functionality changes: ... - Implemented separate Map View contexts for different map modes - Puzzle map now works - Enemy movement now works as in H3 - Removed no longer used code - Implemented missing embark/disembark sounds - Fixed view focusing on embarking/disembarking - Fixed focusing on movement near edge of terra incognita - Fixed sea movement sound	2023-03-05 18:02:58 +02:00
Ivan Savenko	ca13e7dedf	Implemented terrain palette animatiions. Removed old code	2023-03-05 17:48:02 +02:00
Ivan Savenko	4ec13dc5ab	Fix object names in editor	2023-03-05 17:30:38 +02:00
nordsoft	cbb3167166	Regression fix	2023-03-05 00:20:47 +04:00
Konstantin	e4f4eb3c1b	vcmi/mapeditor: change source strings	2023-02-14 11:22:27 +03:00
Konstantin	61e61420e9	vcmi/mapeditor: update translations	2023-02-14 02:31:14 +03:00
Konstantin	9675213beb	vcmi: fix #1454 ... This is fix for this issue.	2023-02-14 02:18:15 +03:00
nordsoft	f1b348ae87	Suppress warning	2023-02-08 20:09:37 +04:00
nordsoft	06c451c1f5	Fix compiling	2023-02-08 20:09:37 +04:00
nordsoft	da8942ccfb	Try to fix compilation	2023-02-08 20:09:37 +04:00
nordsoft	44e195c625	Fix compiling according to latest changes	2023-02-08 20:09:37 +04:00
nordsoft	fac93bb7d6	Address review comments	2023-02-08 20:09:37 +04:00
nordsoft	e0b467e144	Code polishing	2023-02-08 20:09:37 +04:00
nordsoft	447e01aba3	Proper defeat message	2023-02-08 20:09:37 +04:00
nordsoft	5fceb97838	Support few more victory conditions	2023-02-08 20:09:37 +04:00
nordsoft	7f55916a4b	Support couple more conditions	2023-02-08 20:09:37 +04:00
nordsoft	a3413eefce	Some vic/loss conditions for editor	2023-02-08 20:09:37 +04:00
nordsoft	4e21aab76a	Continue working on vicloss conditions	2023-02-08 20:09:37 +04:00
nordsoft	4ce68298d1	Starting work on map settings	2023-02-08 20:09:37 +04:00
Ivan Savenko	9c59025db0	Merge master -> develop	2023-02-03 13:26:44 +02:00
Konstantin	4feab69867	mapeditor: use vcmi_endian.h ... There is no need to redefine this functions, let's use shared implementation	2023-02-03 00:39:44 +03:00
Ivan Savenko	49c94c1498	Merge pull request #1522 from rilian-la-te/russia ... Russian translation and Qt6 translation update	2023-02-01 12:26:35 +02:00