AlexVinS 37d0dad70a Merge branch 'develop' into feature/VCMIMapFormat1 ...

Conflicts:
	lib/CArtHandler.cpp

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

..

CArmedInstance.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +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

Refactoring: use cleaner CCreatureSet::stacksCount everywhere

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

CGHeroInstance.h

Comments save format backward compatability code as Ivan suggested

2015-12-06 02:51:54 +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

Refactoring: use cleaner CCreatureSet::stacksCount everywhere

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

CGPandoraBox.h

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

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

CGTownInstance.cpp

Bonus system: add treeHasChanged call where bonus objects changed

2015-12-11 16:13:18 +03:00

CGTownInstance.h

reduced visibility for members of Mine and Dwellings

2015-12-02 22:34:13 +02:00

CObjectClassesHandler.cpp

Fix subObject identification

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

CObjectClassesHandler.h

post-merge fixes

2015-12-05 13:56:38 +03:00

CObjectHandler.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

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

CObjectHandler.h

post-merge fixes

2015-12-05 13:56:38 +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

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

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

CQuest.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +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

Removed includes of CGameState from headers

2015-12-02 21:39:53 +02:00

CRewardableObject.h

Fix CGBonusingObject serialization

2014-12-22 11:56:53 +03:00

JsonRandom.cpp

Fix filenames in file headers

2015-12-08 09:53:14 +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

Merge branch 'develop' into feature/VCMIMapFormat1

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

MiscObjects.h

Merge branch 'develop' into feature/VCMIMapFormat1

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

ObjectTemplate.cpp

ObjectTemplate serialization

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

ObjectTemplate.h

ObjectTemplate serialization

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