AlexVinS 752965ff69 Merge branch 'develop' into SpellsRefactoring4 ...

Conflicts:
	lib/CSpellHandler.cpp

2014-11-14 05:28:23 +03:00

..

creatures

Enchanters, sharpshooters and dragons are not "special" and should normally spawn on the map.

2014-07-26 10:42:12 +02:00

factions

Fixes 1852 - fixed typo in tower config and added check to detect such cases

2014-08-04 14:47:42 +03:00

heroes

Fixed #1600 - incorrect specialty of Saurug

2014-05-16 19:27:01 +02:00

objects

Fixed #1871

2014-10-29 16:40:52 +01:00

schemas

Introduced new spell configuration options (not used yet)

2014-11-13 13:37:42 +03:00

spells

Merge branch 'develop' into SpellsRefactoring4

2014-11-14 05:28:23 +03:00

artifacts.json

Legion artifact bugfixes

2014-10-25 19:09:21 -04:00

battles_graphics.json

Fix #1737

2014-05-17 16:07:19 +04:00

battleStartpos.json

…

bonuses_texts.json

Added graphics for GENERAL_DAMAGE_REDUCTION bonus. Files are now in vcmi mod.

2014-10-28 19:04:34 +01:00

bonuses.json

…

buildings5.json

…

campaign_regions.json

…

campaignMedia.json

…

campaignSets.json

…

commanders.json

…

defaultMods.json

Merged changes from upstream and fixed compilation caused by API changes

2014-06-03 22:45:18 +03:00

ERMU_to_picture.json

…

filesystem.json

…

fonts.json

…

gameConfig.json

Banks now use new scheme as well

2014-06-22 13:39:40 +03:00

heroClasses.json

- Implemented "mapObject" entry for hero classes

2014-06-16 19:27:26 +03:00

mainmenu.json

…

mapOverrides.json

…

NEUTRAL.PAL

…

obstacles.json

…

resolutions.json

Moved all resolutions but 800x600 into a separate mod

2014-08-03 19:11:54 +03:00

resources.json

…

rmg.json

Option to allow / ban certain types of town in a template.

2014-10-30 10:00:29 +01:00

sp_sounds.json

[Spells] Added basic support for icons and sounds

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

startres.json

…

terrains.json

…

terrainViewPatterns.json

…

translate.json

Implemnted enemy turn speed selection:

2014-08-11 19:16:39 +03:00