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
..
CCampaignHandler.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
CCampaignHandler.h	Full rework of pre-game interface and networking	2018-04-04 14:24:26 +07:00
CDrawRoadsOperation.cpp	Simplify statements	2019-03-31 09:43:14 +03:00
CDrawRoadsOperation.h	Removed all #include's of CMap.h from headers.	2015-12-02 21:05:10 +02:00
CMap.cpp	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
CMap.h	Full rework of pre-game interface and networking	2018-04-04 14:24:26 +07:00
CMapDefines.h	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00
CMapEditManager.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
CMapEditManager.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
CMapInfo.cpp	Full rework of pre-game interface and networking	2018-04-04 14:24:26 +07:00
CMapInfo.h	Full rework of pre-game interface and networking	2018-04-04 14:24:26 +07:00
CMapService.cpp	Spells configuration version 2 (effect-based)	2018-02-08 11:37:21 +03:00
CMapService.h	Spells configuration version 2 (effect-based)	2018-02-08 11:37:21 +03:00
MapFormatH3M.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
MapFormatH3M.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
MapFormatJson.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
MapFormatJson.h	Improved map format tests	2017-08-03 13:50:54 +03:00