AlexVinS 195eae48ca Merge branch 'develop' into SDL2 ... Conflicts: client/CPlayerInterface.cpp		2014-07-02 17:15:12 +04:00
..
artifact.json	Improved json validation	2013-10-26 19:33:34 +00:00
bonus.json	Fix bonus schema to support array in duration	2014-03-01 18:42:31 +00:00
creature.json	- Fixed some warnings from cppcheck	2013-11-06 13:42:58 +00:00
faction.json	- Implemented "mapObject" entry for hero classes	2014-06-16 19:27:26 +03:00
hero.json	Improved json validation	2013-10-26 19:33:34 +00:00
heroClass.json	- Implemented "mapObject" entry for hero classes	2014-06-16 19:27:26 +03:00
mapHeader.json	Data for campaign win/loss conditions. All campaigns should now have	2014-01-01 13:30:31 +00:00
mod.json	Minor fix to schema, server will print visited objects in debug log	2014-06-25 00:23:56 +03:00
object.json	Bugfixing, game can finally load to main menu without crash	2014-06-04 11:25:13 +03:00
objectTemplate.json	Implemented object schema. Commiting current progress before sync with	2014-06-03 21:43:33 +03:00
objectType.json	- Implemented "mapObject" entry for hero classes	2014-06-16 19:27:26 +03:00
settings.json	Still try to fix opengl backend	2014-06-13 07:55:45 +04:00
spell.json	Spell configuration: introduce simplifaction mechanism for level conficuration	2014-05-18 18:47:18 +04:00
townBuilding.json	Added "produce" section in "building" structure. Changed dailyIncome.	2014-04-26 18:23:35 +04:00
townSiege.json	- catapult attacks should be identical to H3	2013-08-06 11:20:28 +00:00
townStructure.json	More string ID's for buildings:	2013-12-04 10:36:39 +00:00