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
..
AdventureMapClasses.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
AdventureMapClasses.h	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
Buttons.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
Buttons.h	Fix bug: LobbyScreen UI has a bug on the Difficulty toggle group.	2020-01-21 01:09:08 -08:00
CArtifactHolder.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
CArtifactHolder.h	Gui cleanup3 - UI refactoring to use smart pointers (#440)	2018-04-07 18:34:11 +07:00
CComponent.cpp	tweaks	2021-02-15 15:03:32 +03:00
CComponent.h	Gui cleanup3 - UI refactoring to use smart pointers (#440)	2018-04-07 18:34:11 +07:00
CGarrisonInt.cpp	Fixes for code review issues	2021-02-20 04:57:50 +03:00
CGarrisonInt.h	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
Images.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
Images.h	Gui cleanup4 (#446)	2018-07-25 01:36:48 +03:00
MiscWidgets.cpp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
MiscWidgets.h	Gui cleanup3 - UI refactoring to use smart pointers (#440)	2018-04-07 18:34:11 +07:00
ObjectLists.cpp	Fix: 'Load' and 'Main menu' in-game buttons should work properly	2021-01-17 19:18:26 +03:00
ObjectLists.h	Fix: 'Load' and 'Main menu' in-game buttons should work properly	2021-01-17 19:18:26 +03:00
TextControls.cpp	[3167] Fix SDL_StopTextInput extra calls	2021-02-15 21:11:18 +03:00
TextControls.h	Revert old statusbar hackfix	2019-06-06 22:56:14 +02:00