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
..
ai	Nullkiller: rename VCAI to AIGateway	2021-07-26 21:02:50 +03:00
creatures	Towers should block ranged retalitation	2022-04-09 11:55:27 +03:00
factions	Place proper towns in underground (#743)	2022-05-28 16:03:50 +03:00
heroes	Fixes mantis tickets 2899 and 2984 (bugged hero spell specialties)	2021-02-08 23:58:12 +01:00
objects	allow configurable battleground graphics	2022-08-29 08:53:35 +03:00
schemas	Revert "Obstacles works fine without regression"	2022-09-04 15:47:53 +04:00
spells	Fixed Gargoyles immunity, issue 3112.	2020-05-07 21:20:36 +03:00
ambientSounds.json	Implement configurable object sounds: ambient, visit and removal	2018-01-02 09:49:03 +01:00
artifacts.json	Fixed Gargoyles immunity, issue 3112.	2020-05-07 21:20:36 +03:00
battlefields.json	Fix typo	2022-08-29 08:53:35 +03:00
battles_graphics.json	battlefields in VLC and custom bonuses for terrain patches	2022-08-29 08:53:35 +03:00
battleStartpos.json
bonuses_texts.json	Initialize the change.	2020-01-19 04:12:59 +00:00
bonuses.json	Initialize the change.	2020-01-19 04:12:59 +00:00
buildings5.json
campaign_regions.json
campaignMedia.json
campaignSets.json
commanders.json
defaultMods.json	Hardcoded feature: no random week/month effects	2019-03-17 18:27:05 +01:00
ERMU_to_picture.json
filesystem.json	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
fonts.json
gameConfig.json	Revert "Obstacles works fine without regression"	2022-09-04 15:47:53 +04:00
heroClasses.json	Fixed https://bugs.vcmi.eu/view.php?id=3017	2018-11-07 10:02:27 +03:00
mainmenu.json
mapOverrides.json
NEUTRAL.PAL
obstacles.json	Revert "Game runs without crash"	2022-09-04 15:47:58 +04:00
randomMap.json	Mine roads (#808)	2022-09-04 09:54:06 +03:00
resolutions.json
resources.json
skills.json	fixed bug with mysticism specialty	2018-02-18 20:22:23 +13:00
sp_sounds.json
startres.json
terrains.json	Final preparations for merge into develop (#780)	2022-09-03 19:02:24 +03:00
terrainViewPatterns.json
translate.json	Feature: Magic Well should work in the fan towns	2021-09-04 14:15:37 +03:00