AlexVinS 1bc41b3ba3 Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1 ...

Conflicts:
	lib/mapObjects/CGHeroInstance.cpp

2016-02-03 05:04:44 +03:00

..

AdapterLoaders.cpp

Add hardcodedFeature to switch winner's retreating with no troops

2016-01-27 16:42:17 +03:00

AdapterLoaders.h

Add hardcodedFeature to switch winner's retreating with no troops

2016-01-27 16:42:17 +03:00

CArchiveLoader.cpp

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

CArchiveLoader.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CBinaryReader.cpp

Unicode support.

2013-10-25 21:45:14 +00:00

CBinaryReader.h

Filesystem handling is now more flexible

2013-07-28 14:49:50 +00:00

CCompressedStream.cpp

Fix tiny memory leak on opening/closing new game window

2015-02-07 17:30:57 +03:00

CCompressedStream.h

Fix filenames in file headers

2015-12-08 09:53:14 +03:00

CFileInfo.cpp

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

CFileInfo.h

- vcmi can now calculate crc32 checksum of a file

2013-11-08 20:36:26 +00:00

CFileInputStream.cpp

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

CFileInputStream.h

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

CFilesystemLoader.cpp

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

CFilesystemLoader.h

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

CInputOutputStream.h

Define bridge interface to minizip IOAPI

2015-12-05 12:06:40 +03:00

CInputStream.h

Define basic design of output streams

2015-12-05 12:06:32 +03:00

CMemoryBuffer.cpp

WiP on zip serialization

2015-12-05 12:06:47 +03:00

CMemoryBuffer.h

Wip on zip serialize fixes

2015-12-05 12:06:45 +03:00

CMemoryStream.cpp

- Renamed /lib subfolders to lowercase

2013-04-07 10:48:07 +00:00

CMemoryStream.h

Added draft of IO memeory buffer

2015-12-05 12:06:33 +03:00

COutputStream.h

Define bridge interface to minizip IOAPI

2015-12-05 12:06:40 +03:00

CStream.h

Start implementing map saver

2015-12-05 12:06:42 +03:00

CZipLoader.cpp

Wip on zip serialize fixes

2015-12-05 12:06:45 +03:00

CZipLoader.h

Start implementing map saver

2015-12-05 12:06:42 +03:00

CZipSaver.cpp

Implemented terrain serialisation

2015-12-05 12:36:34 +03:00

CZipSaver.h

Start implementing actulal json serialization

2015-12-05 12:06:44 +03:00

Filesystem.cpp

VCMIDirs update #5

2014-08-21 22:26:28 +02:00

Filesystem.h

- migrated boost::function/ref/bind to std:: variants

2014-08-04 20:33:59 +02:00

ISimpleResourceLoader.h

Add hardcodedFeature to switch winner's retreating with no troops

2016-01-27 16:42:17 +03:00

MinizipExtensions.cpp

Implemented terrain serialisation

2015-12-05 12:36:34 +03:00

MinizipExtensions.h

Start implementing map saver

2015-12-05 12:06:42 +03:00

ResourceID.cpp

Check that resource type set before setName used

2015-02-06 10:51:32 +03:00

ResourceID.h

Check that resource type set before setName used

2015-02-06 10:51:32 +03:00