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

..

CArmedInstance.cpp

CGMine, CGArtifact, CGGarrison serialization

2016-01-23 19:53:02 +03:00

CArmedInstance.h

Added stubs for some Map objects serialization

2015-12-05 12:38:35 +03:00

CBank.cpp

Refactoring: use cleaner CCreatureSet::stacksCount everywhere

2015-12-24 21:30:57 +03:00

CBank.h

VCMIDirs update #4

2014-08-11 20:17:17 +02:00

CGHeroInstance.cpp

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

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

CGHeroInstance.h

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

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

CGMarket.cpp

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

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

CGMarket.h

Add "override" to virtual overriden methods

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

CGPandoraBox.cpp

CGCreature: fix crash on draw

2016-01-26 08:41:09 +03:00

CGPandoraBox.h

CGEvent: avoid permanent event removal after visit. Fix issue 2339

2015-11-28 23:03:26 +03:00

CGTownInstance.cpp

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

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

CGTownInstance.h

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

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

CObjectClassesHandler.cpp

fix build

2016-01-24 16:58:24 +03:00

CObjectClassesHandler.h

Merge fixes

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

CObjectHandler.cpp

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

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

CObjectHandler.h

Merge fixes

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

CommonConstructors.cpp

CBankInfo: fix huge memory leak that appear in long run

2015-12-14 11:29:24 +03:00

CommonConstructors.h

Merge branch 'develop' into feature/VCMIMapFormat1

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

CQuest.cpp

Fix 2405 quest timeout mechanics

2016-01-29 09:28:37 +03:00

CQuest.h

wipe constexpr on @DjWarmonger request

2016-01-29 00:34:54 +03:00

CRewardableConstructor.cpp

Implemented (basic) object construction and placement

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

CRewardableConstructor.h

Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG

2014-06-26 20:12:37 +02:00

CRewardableObject.cpp

Make stables message appear if hero has cavaliers but visited stables before

2016-02-01 09:41:15 +03:00

CRewardableObject.h

Make stables message appear if hero has cavaliers but visited stables before

2016-02-01 09:41:15 +03:00

JsonRandom.cpp

Replace std::remove_if with vstd::erase_if

2016-01-26 10:19:58 +03:00

JsonRandom.h

Something that compiles.

2014-06-26 22:05:27 +02:00

MapObjects.h

Cleanup:

2014-06-05 20:26:50 +03:00

MiscObjects.cpp

Fix a crash.

2016-02-05 09:40:20 +03:00

MiscObjects.h

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

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

ObjectTemplate.cpp

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

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

ObjectTemplate.h

ObjectTemplate serialization

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