You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182 ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/QtUtil.h # Code/Legacy/CryCommon/Linux_Win32Wrapper.h # Code/Legacy/CryCommon/ProjectDefines.h # Code/Legacy/CryCommon/StringUtils.h # Code/Legacy/CryCommon/UnicodeBinding.h # Code/Legacy/CryCommon/UnicodeEncoding.h # Code/Legacy/CryCommon/UnicodeFunctions.h # Code/Legacy/CryCommon/UnicodeIterator.h # Code/Legacy/CryCommon/WinBase.cpp # Code/Legacy/CryCommon/platform.h # Code/Legacy/CryCommon/platform_impl.cpp # Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp # Gems/Maestro/Code/Source/Cinematics/Movie.cpp		5 years ago
..
ComponentEntityEditorPlugin	Editor code: tidy up BOOLs,NULLs and overrides pt2.	5 years ago
EditorAssetImporter	Code/Editor	5 years ago
EditorCommon	Minimal TypeInfo header/reduce std interdependencies. (#2688)	5 years ago
FFMPEGPlugin	Merge branch 'development' into cmake/SPEC-7484	5 years ago
PerforcePlugin	platform.h cleanup	5 years ago
ProjectSettingsTool	Merge branch 'development' into cmake/SPEC-7484	5 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago