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

Conflicts:
	lib/CMakeLists.txt
	lib/VCMI_lib.cbp
	lib/filesystem/CFileInputStream.cpp
	lib/filesystem/CZipLoader.cpp
	lib/rmg/CRmgTemplateZone.cpp
	vcmi.workspace

2016-02-08 10:17:25 +03:00

..

CMapGenerator.cpp

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

2016-01-24 15:39:41 +03:00

CMapGenerator.h

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

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

CMapGenOptions.cpp

PreGame: avoid crashing on random map options

2015-11-25 07:25:44 +03:00

CMapGenOptions.h

PreGame: avoid crashing on random map options

2015-11-25 07:25:44 +03:00

CRmgTemplate.cpp

- Added handler classes CRmgTemplateStorage and CTerrainViewPatternConfig to LibClasses

2013-08-17 12:46:48 +00:00

CRmgTemplate.h

- Added handler classes CRmgTemplateStorage and CTerrainViewPatternConfig to LibClasses

2013-08-17 12:46:48 +00:00

CRmgTemplateStorage.cpp

CRmgTemplateStorage now inherits from IHandlerBase

2015-05-26 15:12:24 +02:00

CRmgTemplateStorage.h

Add "override" to virtual overriden methods

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

CRmgTemplateZone.cpp

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

2016-02-08 10:17:25 +03:00

CRmgTemplateZone.h

Added correct connections for Subterranean Gates

2015-06-04 09:02:56 +02:00

CZoneGraphGenerator.cpp

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

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

CZoneGraphGenerator.h

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

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

CZonePlacer.cpp

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

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

CZonePlacer.h

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

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

float3.h

Significantly improved zone graph placement.

2014-10-31 12:58:55 +01:00