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

* servers will not allow using out-of-range slots ( #1061 )

2012-08-30 16:01:19 +00:00

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

Created buildings5.json from buildings5.txt.

2011-09-03 20:45:27 +00:00

campaign_regions.json

- fixed crash on opening spellbook during enemy turn

2012-01-19 14:33:22 +00:00

campaignMedia.json

A bit more text-related work:

2013-08-29 16:41:14 +00:00

campaignSets.json

- move campaigns description into new config file, campaignSets.json

2014-02-14 22:46:06 +00:00

commanders.json

- h3 hero classes and artifacts can be modified via json

2013-03-12 14:56:23 +00:00

defaultMods.json

Hardcoded feature: no random week/month effects

2019-03-17 18:27:05 +01:00

ERMU_to_picture.json

Convert ERMU_to_picture.txt into ERMU_to_picture.json.

2011-08-31 23:27:33 +00:00

filesystem.json

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

fonts.json

- playing a bit with ttf fonts: bugfix + shadow rendering

2013-01-29 22:43:39 +00:00

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

- move campaigns description into new config file, campaignSets.json

2014-02-14 22:46:06 +00:00

mapOverrides.json

- found yet another missing victory condition, fixes 1684

2014-02-02 11:05:05 +00:00

NEUTRAL.PAL

Added palette colors for neutral "player" (Thx to Dru). Support for using them via blueToPlayersAdv(surface, 255).

2009-06-30 15:36:12 +00:00

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

Fix 2292. Fix chat on adventure map, increase maxOutputPerLine

2015-11-08 22:16:58 +03:00

resources.json

Fxied #306 and #856.

2012-04-08 02:14:20 +00:00

skills.json

fixed bug with mysticism specialty

2018-02-18 20:22:23 +13:00

sp_sounds.json

[Spells] Added basic support for icons and sounds

2014-03-10 16:00:58 +00:00

startres.json

Fxied #306 and #856.

2012-04-08 02:14:20 +00:00

terrains.json

Final preparations for merge into develop (#780)

2022-09-03 19:02:24 +03:00

terrainViewPatterns.json

Fix mantis #1859, unknown pattern in underground

2015-03-28 16:41:26 +01:00

translate.json

Feature: Magic Well should work in the fan towns

2021-09-04 14:15:37 +03:00