447 Commits

Author	SHA1	Message	Date
nordsoft	1705d7e43f	Refactor obstacles placer ... # Conflicts: # lib/rmg/ObstaclePlacer.cpp # lib/rmg/ObstaclePlacer.h	2022-09-13 03:31:34 +04:00
nordsoft	d72f50da6d	Merge tag 'MapEditor0.0.3' into vlc-obstacles ... # Conflicts: # client/CGameInfo.cpp # client/CGameInfo.h # client/battle/CBattleInterface.cpp # config/gameConfig.json # config/obstacles.json # config/schemas/battlefield.json # config/schemas/obstacle.json # include/vcmi/Services.h # lib/BattleFieldHandler.cpp # lib/BattleFieldHandler.h # lib/CHeroHandler.cpp # lib/CHeroHandler.h # lib/CModHandler.cpp # lib/GameConstants.cpp # lib/GameConstants.h # lib/IGameCallback.cpp # lib/VCMI_Lib.cpp # lib/VCMI_Lib.h # lib/battle/BattleInfo.cpp # lib/spells/CSpellHandler.cpp # test/mock/mock_Services.h	2022-09-13 03:28:23 +04:00
Nordsoft91	9b96fa2351	Merge pull request #44 from Nordsoft91/gui-ux-improvements ... Editor UX improvements	2022-09-11 21:14:45 +04:00
nordsoft	82d6a6350c	Fix compilation errors	2022-09-11 18:50:59 +04:00
nordsoft	5ce0f7c4e0	Merge remote-tracking branch 'upstream/develop' into cpp-map-editor ... # Conflicts: # lib/CHeroHandler.cpp # lib/mapObjects/CObjectClassesHandler.cpp # lib/mapObjects/CObjectClassesHandler.h # lib/mapObjects/ObjectTemplate.cpp # lib/mapObjects/ObjectTemplate.h # lib/mapping/CCampaignHandler.h # lib/mapping/CMap.h # lib/mapping/CMapEditManager.cpp # lib/mapping/CMapEditManager.h # lib/rmg/CMapGenerator.cpp # lib/rmg/CMapGenerator.h # lib/rmg/ConnectionsPlacer.cpp # lib/rmg/ObjectManager.cpp # lib/rmg/ObstaclePlacer.cpp # lib/rmg/ObstaclePlacer.h # lib/rmg/RiverPlacer.cpp # lib/rmg/RmgArea.h # lib/rmg/RmgMap.cpp # lib/rmg/RmgMap.h # lib/rmg/RmgObject.cpp # lib/rmg/TownPlacer.cpp # lib/rmg/TreasurePlacer.cpp # lib/rmg/TreasurePlacer.h # lib/rmg/WaterProxy.cpp # lib/rmg/Zone.cpp # lib/rmg/Zone.h # lib/serializer/CSerializer.h # lib/spells/CSpellHandler.cpp	2022-09-11 18:26:11 +04:00
DjWarmonger	3d2dc2335b	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
nordsoft	cf9314507b	Fix crash in rmg	2022-09-11 11:31:27 +03:00
DjWarmonger	f81d869b4a	Mine roads (#808) ... * Create dirt roads to mines if there are no roads in a zone.	2022-09-11 11:31:27 +03:00
nordsoft	670bca2fdb	Randomly shuffle required objects to avoid patterns	2022-09-11 11:31:27 +03:00
Nordsoft91	8f0dcf928c	Fix problems with water zone (#784)	2022-09-11 11:31:27 +03:00
Nordsoft91	e028875fe3	Fix RMG bug with incorrect town placement (#779) ... * Fix RMG bug with incorrect town placement * Readability tweak	2022-09-11 11:31:27 +03:00
Nordsoft91	454889598f	Improve treasure placement logic (#775) ... Improve treasure placement logic (#775)	2022-09-11 11:31:27 +03:00
Nordsoft91	1451385a9b	Fix problem with empty areas (#772) ... * Fixes for obstacles and treasures	2022-09-11 11:31:27 +03:00
Nordsoft91	2edf9ef3a4	Fix for sealed-off treasures (#771) ... Fix for sealer-off treasures	2022-09-11 11:31:27 +03:00
Nordsoft91	4bd0ff680a	Random map generator refactoring (#762) ... random map generator refactoring and improvements	2022-09-11 11:31:27 +03:00
Andrii Danylchenko	4b4cc3cf4b	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +03:00
Nordsoft91	aaa07e4d2e	New terrain support - part 1 (#755) ... Initial support of new terrains	2022-09-11 11:31:26 +03:00
Tomasz Zielinski	73cc606ee2	Load template name from user settings	2022-09-11 07:47:32 +02:00
Tomasz Zieliński	97b0fa16ae	Fill obstacles as one operation (for undo). ... However, it works only for obstacles on one type of terrain.	2022-09-06 20:51:45 +02:00
nordsoft	8903d2edaf	Fix crash in rmg	2022-09-05 20:54:24 +04:00
nordsoft	5839ba4ce8	Minor fixes	2022-09-05 05:50:21 +04:00
nordsoft	149790ad2d	Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor ... # Conflicts: # config/randomMap.json # config/terrains.json # lib/rmg/CMapGenerator.cpp # lib/rmg/CMapGenerator.h # lib/rmg/ObjectManager.cpp # lib/rmg/ObjectManager.h # lib/rmg/ObstaclePlacer.cpp # lib/rmg/ObstaclePlacer.h # lib/rmg/RmgArea.h # lib/rmg/RmgMap.cpp # lib/rmg/RmgMap.h # lib/rmg/RoadPlacer.cpp # lib/rmg/RoadPlacer.h # lib/rmg/Zone.cpp # lib/rmg/Zone.h	2022-09-04 15:54:37 +04:00
DjWarmonger	dac4628c45	Mine roads (#808) ... * Create dirt roads to mines if there are no roads in a zone.	2022-09-04 09:54:06 +03:00
nordsoft	ff6cd104cf	Implemented automatic obstacle placement	2022-09-03 16:27:06 +04:00
nordsoft	0fffa846b4	Implemented object placement and filtering	2022-09-03 08:12:07 +04:00
nordsoft	be6a7d1836	Randomly shuffle required objects to avoid patterns	2022-09-01 13:26:11 +03:00
nordsoft	f3caa3d7bb	Progress bar for random map loading	2022-08-31 01:24:12 +04:00
nordsoft	68b106fdc1	Generate random maps from map editor	2022-08-30 17:08:33 +04:00
Nordsoft91	47d3539f41	Fix problems with water zone (#784)	2022-08-29 08:53:36 +03:00
Nordsoft91	f668c65eb2	Fix RMG bug with incorrect town placement (#779) ... * Fix RMG bug with incorrect town placement * Readability tweak	2022-08-29 08:53:36 +03:00
Nordsoft91	f3f1fb8033	Improve treasure placement logic (#775) ... Improve treasure placement logic (#775)	2022-08-29 08:53:36 +03:00
Nordsoft91	ae63e0c30e	Fix problem with empty areas (#772) ... * Fixes for obstacles and treasures	2022-08-29 08:53:36 +03:00
Nordsoft91	9ec0ca332c	Fix for sealed-off treasures (#771) ... Fix for sealer-off treasures	2022-08-29 08:53:36 +03:00
Nordsoft91	c0db4f1d96	Random map generator refactoring (#762) ... random map generator refactoring and improvements	2022-08-29 08:53:36 +03:00
Andrii Danylchenko	ac2bd4f79c	battlefields in VLC and custom bonuses for terrain patches	2022-08-29 08:53:35 +03:00
Nordsoft91	5151da59a7	New terrain support - part 1 (#755) ... Initial support of new terrains	2022-08-29 08:53:35 +03:00
nordsoft	b0526ca51b	Refactoring	2022-08-27 21:25:24 +04:00
nordsoft	035857c190	Fix problems with water zone	2022-08-27 03:21:27 +04:00
Nordsoft91	4458cdf6c9	Fix RMG bug with incorrect town placement (#779) ... * Fix RMG bug with incorrect town placement * Readability tweak	2022-08-22 14:32:54 +03:00
Nordsoft91	d79d788e6f	Improve treasure placement logic (#775) ... Improve treasure placement logic (#775)	2022-08-20 13:17:27 +03:00
Nordsoft91	3fa22ebcb0	Fix problem with empty areas (#772) ... * Fixes for obstacles and treasures	2022-08-11 14:29:39 +03:00
Nordsoft91	457def94ae	Fix for sealed-off treasures (#771) ... Fix for sealer-off treasures	2022-08-09 15:12:58 +03:00
Nordsoft91	6da7c9ccb5	Random map generator refactoring (#762) ... random map generator refactoring and improvements	2022-08-09 08:54:32 +03:00
Andrii Danylchenko	232010c5de	battlefields in VLC and custom bonuses for terrain patches	2022-07-02 14:47:40 +03:00
Nordsoft91	5f1c5c6731	New terrain support - part 1 (#755) ... Initial support of new terrains	2022-06-20 17:39:50 +03:00
Nordsoft91	5054ee011a	Rmg water support (#751) ... * Roads added to shipyard * Load general rmg parameters from config * Fix issue with default zone guard * Move magic numbers related to balance to randomMap.json	2022-06-11 18:40:24 +03:00
Nordsoft91	5c1a66ab69	Rmg water support (#745) ... * RMG: water support and refactoring * Fix seers hut bug	2022-06-11 18:40:24 +03:00
Nordsoft91	9d06e51631	Place proper towns in underground (#743) ... Implement feature of proper town selection in underground and surface * Some minor refactoring of rmg	2022-05-28 16:03:50 +03:00
Nordsoft91	a8265c7052	[0002285] Implement feature with extra resources near mines (#742) ... * RMG: clear start position * [0002285] some heaps of resources are placed nearby mines * Fix leak in case of inability to place resource * Fix indentation according to vcmi style * Add constant for random amount of resources * Code review fixes	2022-05-23 13:08:36 +03:00
Konstantin	c6b198ce14	Warning fix (I moved C++17 and CI to another branch) (#739) ... * clang warning fixes * use CMake 3.10 due to MXE CI does not have 3.13 yet Co-authored-by: Konstantin <rilian@niisi.ras.ru>	2022-05-19 15:14:50 +03:00