161 Commits

Author	SHA1	Message	Date
AlexVinS	51bee1000b	Implemented CGWitchHut::serializeJsonOptions	2016-02-22 03:16:33 +03:00
AlexVinS	dd1aabbe23	Use JsonSerializeFormat for map objects	2016-02-22 02:37:19 +03:00
AlexVinS	a4b6d34ebe	Advance map header serialization	2016-02-21 22:13:20 +03:00
AlexVinS	4ebafa17b4	Remove unused placeholdedHeroes field	2016-02-21 22:12:58 +03:00
AlexVinS	53b5587c2e	Advance map header serialization	2016-02-21 21:21:22 +03:00
AlexVinS	36121696ca	Clenaup	2016-02-18 17:48:04 +03:00
AlexVinS	5a8ee32f89	Tweaks	2016-02-15 18:16:45 +03:00
AlexVinS	ec760632a6	Advance Json serializer ... * added bool, numeric and string support * added some enum support * PoC implementation of logical id condition * Refactoring	2016-02-15 12:21:39 +03:00
AlexVinS	e0af4a665a	Added hacks fot spell scroll support.	2016-02-13 19:43:05 +03:00
AlexVinS	a59f0c23ce	Dedug tweaks	2016-02-13 17:16:00 +03:00
AlexVinS	5a92e0de2b	Small redesign	2016-02-13 16:28:07 +03:00
AlexVinS	22b93106c8	Experimental drafts of Json serializer	2016-02-13 15:04:32 +03:00
AlexVinS	a307d3ca40	tweaks	2016-02-10 13:24:03 +03:00
AlexVinS	fb17914ae5	Debug tweaks	2016-02-10 08:59:24 +03:00
AlexVinS	3c78f960cd	Complete json map format integration	2016-02-10 07:28:00 +03:00
AlexVinS	0c21efb202	Start integration of map format into engine	2016-02-09 20:20:03 +03:00
AlexVinS	483276b128	Merge fixes	2016-02-04 12:28:12 +03:00
AlexVinS	6e205a58b4	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 ... Conflicts: lib/VCMI_lib.cbp lib/filesystem/CZipLoader.cpp lib/filesystem/CZipLoader.h lib/mapObjects/CGTownInstance.cpp	2016-02-04 10:27:51 +03:00
Vadim Markovtsev	8d7629bdab	Fix unused function warning in release mode	2016-02-02 11:12:28 +03:00
Vadim Markovtsev	3926920103	Rename radious -> radius ... There is no such English word, "radious" Some files get new lines in the end - BSD sed bug + best practices	2016-01-31 18:01:58 +03:00
AlexVinS	408f346541	Drafts for hero serialization	2016-01-24 15:35:08 +03:00
AlexVinS	3eb9de0c0b	Grail options serialization	2016-01-24 02:26:32 +03:00
AlexVinS	a638d0cd51	Creature set serialization	2016-01-15 20:24:17 +03:00
AlexVinS	37d0dad70a	Merge branch 'develop' into feature/VCMIMapFormat1 ... Conflicts: lib/CArtHandler.cpp	2016-01-01 20:28:52 +03:00
Arseniy Shestakov	9fd1cff090	Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared ... Long time ago it's was used without prefix to make future switch from boost to std version easier. I discusses this with Ivan and decide to drop these using from Global.h now. This change wouldn't break anything because there was already code with prefix for each of three cases.	2015-12-29 05:43:33 +03:00
ArseniyShestakov	05a34fb417	Use "Favorable" instead of "Favourable" everywhere for consistency ... Original game of course used american english version so we stick to it.	2015-12-06 02:23:41 +03:00
AlexVinS	f33bcee84c	post-merge fixes	2015-12-05 13:56:38 +03:00
AlexVinS	947edc0693	Merge branch 'develop' into feature/VCMIMapFormat1	2015-12-05 13:04:04 +03:00
AlexVinS	3bf9696b13	Tweaks	2015-12-05 12:38:37 +03:00
AlexVinS	2d777ea676	Small (temp) fix. Prevent nulls from serialization.	2015-12-05 12:36:43 +03:00
AlexVinS	2d5a366e6c	Implemented (basic) object construction and placement ... * contain refactoring of RMG and class handling (will be more)	2015-12-05 12:36:42 +03:00
AlexVinS	9cc3dae5fe	Started working on objects serialization	2015-12-05 12:36:42 +03:00
AlexVinS	a5b72ce593	Cleanup	2015-12-05 12:36:41 +03:00
AlexVinS	8493d0cded	Initial implementation of new team settings format	2015-12-05 12:36:40 +03:00
AlexVinS	60825fbbd3	Start implementing PlayerInfo serialisation	2015-12-05 12:36:37 +03:00
AlexVinS	2f67e015e1	Fix build	2015-12-05 12:36:36 +03:00
AlexVinS	7c8d29b871	Start implementing player info serialization	2015-12-05 12:36:36 +03:00
AlexVinS	f5b348a1d1	Formatting	2015-12-05 12:36:35 +03:00
AlexVinS	3af255d1b9	Implemented terrain serialisation ... * with test	2015-12-05 12:36:34 +03:00
AlexVinS	6552acdff6	Check coastal tile OTF	2015-12-05 12:36:29 +03:00
AlexVinS	8bc242d002	Cleanup	2015-12-05 12:06:52 +03:00
AlexVinS	27bf2524a3	Advance triggered events serialization ... (-) missing indentifier serialization (unimplemented in engine) (-) missing tests	2015-12-05 12:06:51 +03:00
AlexVinS	11af00bcdf	Start working on Triggered Events	2015-12-05 12:06:50 +03:00
AlexVinS	f6e2cd16ed	Fix header.mapLevels saving	2015-12-05 12:06:48 +03:00
AlexVinS	0cc7213a27	WiP on zip serialization ... (-) still not works correctly	2015-12-05 12:06:47 +03:00
AlexVinS	f2164abf1b	Wip on zip serialize fixes	2015-12-05 12:06:45 +03:00
AlexVinS	27a29bd035	Start implementing actulal json serialization	2015-12-05 12:06:44 +03:00
AlexVinS	1a8faeb0b9	Start implementing map saver	2015-12-05 12:06:42 +03:00
AlexVinS	0cc47f00c5	Advance map format simple test	2015-12-05 12:06:35 +03:00
AlexVinS	7d16585f89	Use COutputStream in CMapSaverJson	2015-12-05 12:06:34 +03:00