Andrii Danylchenko 9c8d776398 Merge branch 'develop' into handlersAbstraction ... # Conflicts: # CI/linux/before_install.sh # CI/mac/before_install.sh # CI/mxe/before_install.sh # lib/CModHandler.cpp # lib/mapObjects/CObjectClassesHandler.cpp # lib/mapObjects/CObjectClassesHandler.h # lib/mapObjects/CommonConstructors.cpp # server/CGameHandler.cpp # test/CMakeLists.txt # test/spells/effects/TeleportTest.cpp		2021-07-16 00:32:13 +03:00
..
CArmedInstance.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CArmedInstance.h	hacks to optimize a few bonus requests	2020-07-04 17:52:22 +03:00
CBank.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CBank.h	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00
CGHeroInstance.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CGHeroInstance.h	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CGMarket.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CGMarket.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
CGPandoraBox.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CGPandoraBox.h	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00
CGTownInstance.cpp	Fixes for code review issues	2021-02-20 04:57:50 +03:00
CGTownInstance.h	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CObjectClassesHandler.cpp	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
CObjectClassesHandler.h	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
CObjectHandler.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CObjectHandler.h	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CommonConstructors.cpp	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
CommonConstructors.h	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00
CQuest.cpp	tweaks	2021-02-15 15:03:32 +03:00
CQuest.h	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00
CRewardableConstructor.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
CRewardableConstructor.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
CRewardableObject.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CRewardableObject.h	CRewardableObject: remove now unused soundID	2018-01-02 09:49:04 +01:00
JsonRandom.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
JsonRandom.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
MapObjects.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
MiscObjects.cpp	tweaks	2021-02-15 15:03:32 +03:00
MiscObjects.h	CGLighthouse: workaround crash on map initialization. Fix issue 3020	2018-11-01 23:31:23 +03:00
ObjectTemplate.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
ObjectTemplate.h	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00