nordsoft e5e5e78fca Merge remote-tracking branch 'upstream/develop' into vlc-obstacles ... # Conflicts: # .github/workflows/github.yml # CI/mac/before_install.sh # client/CGameInfo.cpp # client/CGameInfo.h # client/battle/CBattleInterface.cpp # config/gameConfig.json # config/obstacles.json # config/randomMap.json # config/schemas/battlefield.json # config/terrains.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/Terrain.cpp # lib/Terrain.h # lib/VCMI_Lib.cpp # lib/VCMI_Lib.h # lib/battle/BattleInfo.cpp # lib/mapObjects/CObjectClassesHandler.cpp # lib/mapObjects/CObjectClassesHandler.h # lib/mapObjects/ObjectTemplate.cpp # lib/mapObjects/ObjectTemplate.h # lib/mapping/CCampaignHandler.h # lib/rmg/CMapGenerator.cpp # lib/rmg/CMapGenerator.h # lib/rmg/ConnectionsPlacer.cpp # lib/rmg/ObjectManager.cpp # lib/rmg/ObjectManager.h # lib/rmg/ObstaclePlacer.cpp # lib/rmg/RiverPlacer.cpp # lib/rmg/RmgObject.cpp # lib/rmg/RoadPlacer.cpp # lib/rmg/RoadPlacer.h # lib/rmg/TownPlacer.cpp # lib/rmg/TreasurePlacer.cpp # lib/rmg/TreasurePlacer.h # lib/rmg/WaterProxy.cpp # lib/spells/CSpellHandler.cpp # test/mock/mock_Services.h		2022-09-13 03:00:32 +04:00
..
ai	Nullkiller: rename VCAI to AIGateway	2021-07-26 21:02:50 +03:00
creatures	[839] update config	2022-09-11 11:31:27 +03:00
factions	Place proper towns in underground (#743)	2022-05-28 16:03:50 +03:00
heroes	[837] update config	2022-09-11 11:31:27 +03:00
objects	[833] Fix spell scroll sound	2022-09-11 11:31:27 +03:00
schemas	Merge remote-tracking branch 'upstream/develop' into vlc-obstacles	2022-09-13 03:00:32 +04:00
spells	Fixed Gargoyles immunity, issue 3112.	2020-05-07 21:20:36 +03:00
ambientSounds.json
artifacts.json	Fixed Gargoyles immunity, issue 3112.	2020-05-07 21:20:36 +03:00
battlefields.json	Fix typo	2022-09-11 11:31:27 +03:00
battles_graphics.json	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +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
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	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +03:00
heroClasses.json
mainmenu.json
mapOverrides.json
NEUTRAL.PAL
obstacles.json	New battlegrounds (#758)	2022-09-11 11:31:26 +03:00
randomMap.json	Mine roads (#808)	2022-09-11 11:31:27 +03:00
resolutions.json
resources.json
skills.json
sp_sounds.json
startres.json
terrains.json	[832] Fix water ambient sound	2022-09-11 11:31:27 +03:00
terrainViewPatterns.json
translate.json	Feature: Magic Well should work in the fan towns	2021-09-04 14:15:37 +03:00