birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
This commit is contained in:
Esteban Papp
2021-08-10 09:23:34 -07:00
parent 7447df3576 adaeb7c203
commit ec1a08d487
1040 changed files with 29662 additions and 44251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
+2 -2
View File
@@ -165,8 +165,8 @@ namespace ProjectSettingsTool
if (editContext)
{
editContext->Class<AndroidSplashscreens>("Splashscreens", "All splashscreen overrides for Android.")
->DataElement(0, &AndroidSplashscreens::m_landscapeSplashscreens)
->DataElement(0, &AndroidSplashscreens::m_portraitSplashscreens)
->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSplashscreens::m_landscapeSplashscreens)
->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSplashscreens::m_portraitSplashscreens)
;
}
}
Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
namespace
{
typedef ProjectSettingsTool::FunctorValidator::ReturnType RetType;
using RetType = ProjectSettingsTool::FunctorValidator::ReturnType;
static const int noMaxLength = -1;
static const int maxIosVersionLength = 18;