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

..

CCampaignHandler.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CCampaignHandler.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CDrawRoadsOperation.cpp

Fix unused function warning in release mode

2016-02-02 11:12:28 +03:00

CDrawRoadsOperation.h

Removed all #include's of CMap.h from headers.

2015-12-02 21:05:10 +02:00

CMap.cpp

Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

2016-02-04 10:27:51 +03:00

CMap.h

Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

2016-02-04 10:27:51 +03:00

CMapDefines.h

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CMapEditManager.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CMapEditManager.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CMapInfo.cpp

Compile fixes specific for VS 2012"

2013-07-02 15:23:32 +00:00

CMapInfo.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CMapService.cpp

Draft on classes hierarchy.

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

CMapService.h

Initial implementation of new team settings format

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

MapFormatH3M.cpp

Rename radious -> radius

2016-01-31 18:01:58 +03:00

MapFormatH3M.h

CMapLoaderH3M: support for patrol initialPos in readHero

2015-11-27 11:34:03 +03:00

MapFormatJson.cpp

Drafts for hero serialization

2016-01-24 15:35:08 +03:00

MapFormatJson.h

Started working on objects serialization

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