AlexVinS 195eae48ca Merge branch 'develop' into SDL2 ... Conflicts: client/CPlayerInterface.cpp		2014-07-02 17:15:12 +04:00
..
creatures	Tweak Earth, Air elemantals immunities. Also fixes #1553	2014-05-19 12:04:49 +04:00
factions	- Implementation of overrides for towns	2014-06-15 19:43:01 +03:00
heroes	Fixed #1600 - incorrect specialty of Saurug	2014-05-16 19:27:01 +02:00
objects	Bugfixing:	2014-06-28 17:21:38 +03:00
schemas	Merge branch 'develop' into SDL2	2014-07-02 17:15:12 +04:00
spells	More simplification to spell configuration using inheritance semantic.	2014-05-18 21:16:10 +04:00
artifacts.json	Fixed #1667, #1669	2014-02-28 17:49:56 +00:00
bankconfig.json	Banks now use new scheme as well	2014-06-22 13:39:40 +03:00
battles_graphics.json	Fix #1737	2014-05-17 16:07:19 +04:00
battleStartpos.json	* servers will not allow using out-of-range slots ( #1061 )	2012-08-30 16:01:19 +00:00
bonuses_texts.json	Basic Configuration for bonus types	2013-03-06 18:49:56 +00:00
bonuses.json	Basic Configuration for bonus types	2013-03-06 18:49:56 +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	Merged changes from upstream and fixed compilation caused by API changes	2014-06-03 22:45:18 +03: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	- updated wog/vcmi mod.json files	2013-08-20 19:32:21 +00:00
fonts.json	- playing a bit with ttf fonts: bugfix + shadow rendering	2013-01-29 22:43:39 +00:00
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	- 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	- updated wog/vcmi mod.json files	2013-08-20 19:32:21 +00:00
resolutions.json	- removed access to one wog file	2013-05-21 22:11:44 +00:00
resources.json	Fxied #306 and #856.	2012-04-08 02:14:20 +00:00
rmg.json	Uploading misc tweaks.	2014-07-01 07:07:40 +02: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	Minors:	2013-12-28 18:57:08 +00:00
terrainViewPatterns.json	- updated wog/vcmi mod.json files	2013-08-20 19:32:21 +00:00
translate.json	- move campaigns description into new config file, campaignSets.json	2014-02-14 22:46:06 +00:00