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

Merge branch 'development' into optimization/unused_files

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

# Conflicts:
#	Code/Editor/IEditorImpl.cpp
#	Code/Editor/IEditorImpl.h
#	Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
This commit is contained in:
Esteban Papp
2022-01-25 15:40:30 -08:00
parent 4d62351628 56e7e70735
commit 6fad254b59
871 changed files with 19489 additions and 7437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AWSNativeSDKInit/CMakeLists.txt
+18 -18
View File
@@ -25,28 +25,28 @@ ly_add_target(
AZ::AzCore
)
ly_add_target(
NAME AWSNativeSDKTestLibs STATIC
NAMESPACE AZ
FILES_CMAKE
aws_native_sdk_test_files.cmake
INCLUDE_DIRECTORIES
PUBLIC
include
tests/libs
PRIVATE
source
BUILD_DEPENDENCIES
PRIVATE
3rdParty::AWSNativeSDK::Core
AZ::AzCore
AZ::AzTest
)
################################################################################
# Tests
################################################################################
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME AWSNativeSDKTestLibs STATIC
NAMESPACE AZ
FILES_CMAKE
aws_native_sdk_test_files.cmake
INCLUDE_DIRECTORIES
PUBLIC
include
tests/libs
PRIVATE
source
BUILD_DEPENDENCIES
PRIVATE
3rdParty::AWSNativeSDK::Core
AZ::AzCore
AZ::AzTest
)
ly_add_target(
NAME AWSNativeSDKInit.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
NAMESPACE AZ
Code/Tools/Android/ProjectBuilder/app_icon-hdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2505ee83c0e435700601d38c7c4b08b601478c5194a088ff6577e1017731b3ae
size 2368
oid sha256:2323fb234c075a6d18eed7575338fcb2c3aef119c19d5aedb2b45c18b3c8d69e
size 2275
Code/Tools/Android/ProjectBuilder/app_icon-mdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32d4da537649036b18aa116c1337b8b23d1a4536b907034a1262cc6764e65627
size 1615
oid sha256:4f8b3aeeecb6baad0ba0be4c1f7b128fc609af82fea88019d322d85de693519c
size 1969
Code/Tools/Android/ProjectBuilder/app_icon-xhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a7f38fe03aba465b65189fdf183281c0d7397962f93168379ebca25f9581a30
size 3362
oid sha256:d6cb3e1b2d44927f300877c63c4181dabe08861bcc085ecfa9dee40e145af2cf
size 2504
Code/Tools/Android/ProjectBuilder/app_icon-xxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02392ac01615ce21710b8566085941fea67926cab062ac2a4c7cdfc594aff428
size 5482
oid sha256:746bc5803e8d5dd84b5c255211d167f61beac1c4f9a5a206edff340610fffe7d
size 3247
Code/Tools/Android/ProjectBuilder/app_icon-xxxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3636ef346cf87d2382ed67ef0a7396bfe3b4df13f9ef223b1911e96ef42ae2ec
size 8238
oid sha256:1f93be4cff524be96f0fdd2f2bc5c233b8c1391bb8c47abacd028026ed7ce672
size 3887
Code/Tools/Android/ProjectBuilder/app_splash-land-hdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df22836ffc2ab5cca07c6e0d152ed8ef01d56d66cdc56435d6b48304753c4990
size 196450
oid sha256:c40fdabfe1391421cef0c1d7fb3e5b2173aac29d6aaf664ed54b9c39aee5e077
size 17714
Code/Tools/Android/ProjectBuilder/app_splash-land-mdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:70250143d6b53978c7a164330c38cf34777688b92e0def691b68777be111ac75
size 156821
oid sha256:22c800b9b1ea513c93162e5549492b2841bc9c8bf94b1a9273f26be1dd4e4517
size 16494
Code/Tools/Android/ProjectBuilder/app_splash-land-xhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80752114b225ad43028278ac8372cbf4543f493a55e5fe05c24ff1e20f9b24b5
size 324436
oid sha256:264aff020a8bc1665aaddaec10e4e453b1a551b4c84c08fddbb315c5aa7202c1
size 33469
Code/Tools/Android/ProjectBuilder/app_splash-land-xxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44de927141f19e10672012a8e0675d03fd06e6b20d5a7c759cdc233a1262ef55
size 441038
oid sha256:6dded39dd078168e92f1fd47e4728f99f06a6a988a57d5e56ddc0eeb3d4985ef
size 50380
Code/Tools/Android/ProjectBuilder/app_splash-port-hdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3fb185179d26442087087401dd96443ed094122b8b7a1b7985aae299764bcf6
size 271782
oid sha256:de82dd62268697af0a02dbfad1cd37f153cc0dc08a2d40cec0bbf4fe582fcb50
size 16257
Code/Tools/Android/ProjectBuilder/app_splash-port-mdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04c9bc74b51d3bd7cf85e178b15c631fd78c6251ef014a41506f36852ec4a500
size 209127
oid sha256:70a234b518d00b6be6459f2731d84c23271683d72b775909683ea3b5738d3313
size 13053
Code/Tools/Android/ProjectBuilder/app_splash-port-xhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:913fdddb651ff6d74fb0583b06c6f32f6c87bf9eabe4b861d662c9c409cff733
size 461061
oid sha256:0cc200156f762ee8101b8b9eb3d6640c130a889b4507f95eb160524109bfde1d
size 27508
Code/Tools/Android/ProjectBuilder/app_splash-port-xxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb9fd81fb4ad83132db7401fe412cce61bf0577e1822653115930f31f3db6241
size 570118
oid sha256:c6b01162660664b097ce26ffef1c4171b33565b380f58064c78980335617ca5e
size 42415
Code/Tools/AssetBundler/tests/DummyProject/project.json
+1 -1
View File
@@ -6,7 +6,7 @@
"project_id": "{91FB81A1-072C-4A80-8FCC-7E2C4C767B4D}",
"android_settings" : {
"package_name" : "com.lumberyard.yourgame",
"package_name" : "org.o3de.yourgame",
"version_number" : 1,
"version_name" : "1.0.0.0",
"orientation" : "landscape"
Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.cpp
+1
View File
@@ -13,6 +13,7 @@
#include <AzCore/Component/ComponentApplication.h>
#include <AzCore/IO/IStreamer.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/IO/Streamer/FileRequest.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/Serialization/Utils.h>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
+1 -1
View File
@@ -544,7 +544,7 @@ void ApplicationManagerBase::InitConnectionManager()
EBUS_EVENT(AssetProcessor::ConnectionBus, SendPerPlatform, 0, message, QString::fromUtf8(message.m_platform.c_str()));
};
bool result = QObject::connect(GetAssetCatalog(), &AssetProcessor::AssetCatalog::SendAssetMessage, connectionAndChangeMessagesThreadContext, forwardMessageFunction, Qt::QueuedConnection);
[[maybe_unused]] bool result = QObject::connect(GetAssetCatalog(), &AssetProcessor::AssetCatalog::SendAssetMessage, connectionAndChangeMessagesThreadContext, forwardMessageFunction, Qt::QueuedConnection);
AZ_Assert(result, "Failed to connect to AssetCatalog signal");
//Application manager related stuff
Code/Tools/AssetProcessor/native/utilities/BuilderManager.inl
+1 -1
View File
@@ -19,7 +19,7 @@ namespace AssetProcessor
TNetResponse netResponse;
netRequest.m_request = request;
AZ::u32 type;
[[maybe_unused]] AZ::u32 type;
QByteArray data;
AZStd::binary_semaphore wait;
Code/Tools/AzTestRunner/CMakeLists.txt
-1
View File
@@ -27,7 +27,6 @@ if(PAL_TRAIT_AZTESTRUNNER_SUPPORTED AND NOT LY_MONOLITHIC_GAME)
PRIVATE
AZ::AzCore
AZ::AzTest
AZ::AzFramework
)
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
Code/Tools/AzTestRunner/Platform/Android/android_project.json
+1 -1
View File
@@ -2,7 +2,7 @@
"project_name" : "AzTestRunner",
"product_name" : "AzTestRunner Project",
"android_settings": {
"package_name" : "com.lumberyard.tests",
"package_name" : "org.o3de.tests",
"version_number": 1,
"version_name" : "1.0.0",
"orientation" : "landscape",
Code/Tools/AzTestRunner/Platform/Android/platform_android.cmake
+5
View File
@@ -10,3 +10,8 @@ set(LY_INCLUDE_DIRECTORIES
PRIVATE
${LY_NDK_NATIVE_APP_GLUE_SRC_DIR}
)
set(LY_BUILD_DEPENDENCIES
PRIVATE
AZ::AzFramework
)
Code/Tools/AzTestRunner/Platform/iOS/Resources/Info.plist
+1 -1
View File
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>AzTestRunner</string>
<key>CFBundleIdentifier</key>
<string>com.lumberyard.tests</string>
<string>org.o3de.tests</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Code/Tools/ProjectManager/Source/Application.cpp
+4 -5
View File
@@ -198,9 +198,7 @@ namespace O3DE::ProjectManager
return true;
}
bool forceRegistration = false;
// check if an engine with this name is already registered
// check if an engine with this name is already registered and has a valid engine.json
auto existingEngineResult = m_pythonBindings->GetEngineInfo(engineInfo.m_name);
if (existingEngineResult)
{
@@ -232,10 +230,11 @@ namespace O3DE::ProjectManager
// user elected not to change the name or force registration
return false;
}
forceRegistration = true;
}
// always force register in case there is an engine registered in o3de_manifest.json, but
// the engine.json is missing or corrupt in which case GetEngineInfo() fails
constexpr bool forceRegistration = true;
auto registerOutcome = m_pythonBindings->SetEngineInfo(engineInfo, forceRegistration);
if (!registerOutcome)
{
Code/Tools/ProjectManager/Source/PythonBindings.cpp
+3
View File
@@ -459,6 +459,9 @@ namespace O3DE::ProjectManager
if (!pybind11::isinstance<pybind11::none>(enginePathResult))
{
engineInfo = EngineInfoFromPath(enginePathResult);
// it is possible an engine is registered in o3de_manifest.json but the engine.json is
// missing or corrupt in which case we do not consider it a registered engine
}
});
Code/Tools/ProjectManager/Source/Settings.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ namespace O3DE::ProjectManager
o3deUserPath /= AZ::SettingsRegistryInterface::RegistryFolder;
o3deUserPath /= "ProjectManager.setreg";
bool saved = false;
[[maybe_unused]] bool saved = false;
constexpr auto configurationMode =
AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ protected:
sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore");
AZ_Assert(sceneCoreModule, "SceneBuilder unit tests failed to create SceneCore module.");
bool loaded = sceneCoreModule->Load(false);
[[maybe_unused]] bool loaded = sceneCoreModule->Load(false);
AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneCore module.");
auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneCore module.");