diff --git a/Code/Editor/MainWindow.h b/Code/Editor/MainWindow.h index 1e375b08f2..33f3d2d011 100644 --- a/Code/Editor/MainWindow.h +++ b/Code/Editor/MainWindow.h @@ -64,11 +64,11 @@ namespace AzToolsFramework //! @name Reverse URLs. //! Used to identify common actions and override them when necessary. //@{ - constexpr inline AZ::Crc32 EditModeMove = AZ_CRC_CE("com.o3de.action.editor.editmode.move"); - constexpr inline AZ::Crc32 EditModeRotate = AZ_CRC_CE("com.o3de.action.editor.editmode.rotate"); - constexpr inline AZ::Crc32 EditModeScale = AZ_CRC_CE("com.o3de.action.editor.editmode.scale"); - constexpr inline AZ::Crc32 SnapToGrid = AZ_CRC_CE("com.o3de.action.editor.snaptogrid"); - constexpr inline AZ::Crc32 SnapAngle = AZ_CRC_CE("com.o3de.action.editor.snapangle"); + constexpr inline AZ::Crc32 EditModeMove = AZ_CRC_CE("org.o3de.action.editor.editmode.move"); + constexpr inline AZ::Crc32 EditModeRotate = AZ_CRC_CE("org.o3de.action.editor.editmode.rotate"); + constexpr inline AZ::Crc32 EditModeScale = AZ_CRC_CE("org.o3de.action.editor.editmode.scale"); + constexpr inline AZ::Crc32 SnapToGrid = AZ_CRC_CE("org.o3de.action.editor.snaptogrid"); + constexpr inline AZ::Crc32 SnapAngle = AZ_CRC_CE("org.o3de.action.editor.snapangle"); //@} } diff --git a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java index a234d323eb..846114110f 100644 --- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java +++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java @@ -64,7 +64,7 @@ public class LumberyardActivity extends NativeActivity //////////////////////////////////////////////////////////////// // called from the native to get the application package name - // e.g. com.lumberyard.samples for SamplesProject + // e.g. org.o3de.samples for SamplesProject public String GetPackageName() { return getApplicationContext().getPackageName(); diff --git a/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h b/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h index 153a6450e1..d00774b88c 100644 --- a/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h +++ b/Code/Framework/AzCore/AzCore/Android/AndroidEnv.h @@ -116,7 +116,7 @@ namespace AZ const char* GetObbStoragePath() const { return m_obbStoragePath.c_str(); } //! Get the dot separated package name for the current application. - //! e.g. com.lumberyard.samples for SamplesProject + //! e.g. org.o3de.samples for SamplesProject const char* GetPackageName() const { return m_packageName.c_str(); } //! Get the app version code (android:versionCode in the manifest). diff --git a/Code/Framework/AzCore/AzCore/Android/Utils.h b/Code/Framework/AzCore/AzCore/Android/Utils.h index 08a21e0010..51936e51b6 100644 --- a/Code/Framework/AzCore/AzCore/Android/Utils.h +++ b/Code/Framework/AzCore/AzCore/Android/Utils.h @@ -52,7 +52,7 @@ namespace AZ const char* GetObbStoragePath(); //! Get the dot separated package name for the current application. - //! e.g. com.o3de.samples for SamplesProject + //! e.g. org.o3de.samples for SamplesProject const char* GetPackageName(); //! Get the app version code (android:versionCode in the manifest). diff --git a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h index e99f29e051..86e89b4a95 100644 --- a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h +++ b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h @@ -86,7 +86,7 @@ #define AZ_TRAIT_SYSTEMFILE_INVALID_HANDLE nullptr #define AZ_TRAIT_SYSTEMFILE_FSYNC_IS_DEFINED 1 #define AZ_TRAIT_SYSTEMFILE_UNIX_LIKE_PLATFORM_IS_WRITEABLE_DEFINED_ELSEWHERE 0 -#define AZ_TRAIT_TEST_ROOT_FOLDER "/sdcard/Android/data/com.lumberyard.tests/files" +#define AZ_TRAIT_TEST_ROOT_FOLDER "/sdcard/Android/data/org.o3de.tests/files" #define AZ_TRAIT_TEST_SUPPORT_DLOPEN 0 #define AZ_TRAIT_TEST_SUPPORT_LOADLIBRARY 0 #define AZ_TRAIT_TEST_SUPPORT_MODULE_LOADING 0 diff --git a/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp b/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp index 5f46aef87c..1c392c1034 100644 --- a/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp +++ b/Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp @@ -15,7 +15,7 @@ namespace AZ { ScopedAutoTempDirectory::ScopedAutoTempDirectory() { - char tempDirectoryTemplate[] = "/sdcard/Android/data/com.lumberyard.tests/files/UnitTest-XXXXXX"; + char tempDirectoryTemplate[] = "/sdcard/Android/data/org.o3de.tests/files/UnitTest-XXXXXX"; const char* tempDir = mkdtemp(tempDirectoryTemplate); AZ_Error("AzTest", tempDir, "Unable to create temp directory %s", tempDirectoryTemplate); memset(m_tempDirectory, '\0', sizeof(m_tempDirectory)); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp index d61efe0b6d..dfa8ad14c9 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp @@ -217,7 +217,7 @@ namespace AzToolsFramework }); EditorActionRequestBus::Broadcast( - &EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("com.o3de.action.editortransform.prefabopen"), + &EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("org.o3de.action.editortransform.prefabopen"), m_actions.back().get()); } @@ -237,7 +237,7 @@ namespace AzToolsFramework }); EditorActionRequestBus::Broadcast( - &EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("com.o3de.action.editortransform.prefabclose"), + &EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("org.o3de.action.editortransform.prefabclose"), m_actions.back().get()); } } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h index c0562025b6..6b5eb45b96 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h @@ -23,11 +23,11 @@ namespace AzToolsFramework /// @name Reverse URLs. /// Used to identify common actions and override them when necessary. //@{ - static const AZ::Crc32 s_backAction = AZ_CRC("com.o3de.action.common.back", 0x80c3030f); - static const AZ::Crc32 s_deleteAction = AZ_CRC("com.o3de.action.common.delete", 0x58e78eed); - static const AZ::Crc32 s_duplicateAction = AZ_CRC("com.o3de.action.common.duplicate", 0xbc5a4a23); - static const AZ::Crc32 s_nextComponentMode = AZ_CRC("com.o3de.action.common.nextComponentMode", 0xf9aca3a8); - static const AZ::Crc32 s_previousComponentMode = AZ_CRC("com.o3de.action.common.previousComponentMode", 0x0580eaec); + static const AZ::Crc32 s_backAction = AZ_CRC_CE("org.o3de.action.common.back"); + static const AZ::Crc32 s_deleteAction = AZ_CRC_CE("org.o3de.action.common.delete"); + static const AZ::Crc32 s_duplicateAction = AZ_CRC_CE("org.o3de.action.common.duplicate"); + static const AZ::Crc32 s_nextComponentMode = AZ_CRC_CE("org.o3de.action.common.nextComponentMode"); + static const AZ::Crc32 s_previousComponentMode = AZ_CRC_CE("org.o3de.action.common.previousComponentMode"); //@} /// Specific Action properties to be sent to a type implementing diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h index e4c794e99e..f44de0d6eb 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h @@ -101,7 +101,7 @@ namespace AzToolsFramework { } - AZ::Crc32 m_uri; //!< Unique identifier for the Action. (In the form 'com.o3de.action.---"). + AZ::Crc32 m_uri; //!< Unique identifier for the Action. (In the form 'org.o3de.action.---"). AZStd::vector> m_callbacks; //!< Callbacks associated with this Action (note: with multi-selections //!< there will be a callback per Entity/Component). AZStd::unique_ptr m_action; //!< The QAction associated with the overrideWidget for all ComponentMode actions. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h index 7ae1db1073..4574b648b7 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h @@ -17,23 +17,23 @@ namespace AzToolsFramework //! @name Reverse URLs. //! Used to identify common actions and override them when necessary. //@{ - constexpr inline AZ::Crc32 LockSelection = AZ_CRC_CE("com.o3de.action.editortransform.lockselect"); - constexpr inline AZ::Crc32 UnlockSelection = AZ_CRC_CE("com.o3de.action.editortransform.unlockselect"); - constexpr inline AZ::Crc32 HideSelection = AZ_CRC_CE("com.o3de.action.editortransform.hideselect"); - constexpr inline AZ::Crc32 ShowSelection = AZ_CRC_CE("com.o3de.action.editortransform.showselect"); - constexpr inline AZ::Crc32 UnlockAll = AZ_CRC_CE("com.o3de.action.editortransform.unlockall"); - constexpr inline AZ::Crc32 ShowAll = AZ_CRC_CE("com.o3de.action.editortransform.unhideall"); - constexpr inline AZ::Crc32 SelectAll = AZ_CRC_CE("com.o3de.action.editortransform.selectall"); - constexpr inline AZ::Crc32 InvertSelect = AZ_CRC_CE("com.o3de.action.editortransform.invertselect"); - constexpr inline AZ::Crc32 DuplicateSelect = AZ_CRC_CE("com.o3de.action.editortransform.duplicateselect"); - constexpr inline AZ::Crc32 DeleteSelect = AZ_CRC_CE("com.o3de.action.editortransform.deleteselect"); - constexpr inline AZ::Crc32 EditEscaspe = AZ_CRC_CE("com.o3de.action.editortransform.editescape"); - constexpr inline AZ::Crc32 EditPivot = AZ_CRC_CE("com.o3de.action.editortransform.editpivot"); - constexpr inline AZ::Crc32 EditReset = AZ_CRC_CE("com.o3de.action.editortransform.editreset"); - constexpr inline AZ::Crc32 EditResetManipulator = AZ_CRC_CE("com.o3de.action.editortransform.editresetmanipulator"); - constexpr inline AZ::Crc32 ViewportUiVisible = AZ_CRC_CE("com.o3de.action.editortransform.viewportuivisible"); - constexpr inline AZ::Crc32 Helpers = AZ_CRC_CE("com.o3de.action.editor.helpers"); - constexpr inline AZ::Crc32 Icons = AZ_CRC_CE("com.o3de.action.editor.icons"); + constexpr inline AZ::Crc32 LockSelection = AZ_CRC_CE("org.o3de.action.editortransform.lockselect"); + constexpr inline AZ::Crc32 UnlockSelection = AZ_CRC_CE("org.o3de.action.editortransform.unlockselect"); + constexpr inline AZ::Crc32 HideSelection = AZ_CRC_CE("org.o3de.action.editortransform.hideselect"); + constexpr inline AZ::Crc32 ShowSelection = AZ_CRC_CE("org.o3de.action.editortransform.showselect"); + constexpr inline AZ::Crc32 UnlockAll = AZ_CRC_CE("org.o3de.action.editortransform.unlockall"); + constexpr inline AZ::Crc32 ShowAll = AZ_CRC_CE("org.o3de.action.editortransform.unhideall"); + constexpr inline AZ::Crc32 SelectAll = AZ_CRC_CE("org.o3de.action.editortransform.selectall"); + constexpr inline AZ::Crc32 InvertSelect = AZ_CRC_CE("org.o3de.action.editortransform.invertselect"); + constexpr inline AZ::Crc32 DuplicateSelect = AZ_CRC_CE("org.o3de.action.editortransform.duplicateselect"); + constexpr inline AZ::Crc32 DeleteSelect = AZ_CRC_CE("org.o3de.action.editortransform.deleteselect"); + constexpr inline AZ::Crc32 EditEscaspe = AZ_CRC_CE("org.o3de.action.editortransform.editescape"); + constexpr inline AZ::Crc32 EditPivot = AZ_CRC_CE("org.o3de.action.editortransform.editpivot"); + constexpr inline AZ::Crc32 EditReset = AZ_CRC_CE("org.o3de.action.editortransform.editreset"); + constexpr inline AZ::Crc32 EditResetManipulator = AZ_CRC_CE("org.o3de.action.editortransform.editresetmanipulator"); + constexpr inline AZ::Crc32 ViewportUiVisible = AZ_CRC_CE("org.o3de.action.editortransform.viewportuivisible"); + constexpr inline AZ::Crc32 Helpers = AZ_CRC_CE("org.o3de.action.editor.helpers"); + constexpr inline AZ::Crc32 Icons = AZ_CRC_CE("org.o3de.action.editor.icons"); //@} //! Provide interface for EditorTransformComponentSelection requests. diff --git a/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp b/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp index 81cc0f579e..f8f92a274b 100644 --- a/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp +++ b/Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp @@ -67,7 +67,7 @@ namespace //anonymous "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" diff --git a/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp index fd39f93bb6..51b139e3a7 100644 --- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp +++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp @@ -197,7 +197,7 @@ namespace AzToolsFramework AZStd::vector PlaceHolderComponentMode::PopulateActionsImpl() { - const AZ::Crc32 placeHolderComponentModeAction = AZ_CRC_CE("com.o3de.action.placeholder.test"); + const AZ::Crc32 placeHolderComponentModeAction = AZ_CRC_CE("org.o3de.action.placeholder.test"); return AZStd::vector { diff --git a/Code/Tools/Android/ProjectBuilder/app_icon-hdpi.png b/Code/Tools/Android/ProjectBuilder/app_icon-hdpi.png index b5cb19cc23..9843690934 100644 --- a/Code/Tools/Android/ProjectBuilder/app_icon-hdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_icon-hdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2505ee83c0e435700601d38c7c4b08b601478c5194a088ff6577e1017731b3ae -size 2368 +oid sha256:2323fb234c075a6d18eed7575338fcb2c3aef119c19d5aedb2b45c18b3c8d69e +size 2275 diff --git a/Code/Tools/Android/ProjectBuilder/app_icon-mdpi.png b/Code/Tools/Android/ProjectBuilder/app_icon-mdpi.png index ffe51473ca..26c0ddbfe8 100644 --- a/Code/Tools/Android/ProjectBuilder/app_icon-mdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_icon-mdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32d4da537649036b18aa116c1337b8b23d1a4536b907034a1262cc6764e65627 -size 1615 +oid sha256:4f8b3aeeecb6baad0ba0be4c1f7b128fc609af82fea88019d322d85de693519c +size 1969 diff --git a/Code/Tools/Android/ProjectBuilder/app_icon-xhdpi.png b/Code/Tools/Android/ProjectBuilder/app_icon-xhdpi.png index f05aaae22d..ee1334ed42 100644 --- a/Code/Tools/Android/ProjectBuilder/app_icon-xhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_icon-xhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a7f38fe03aba465b65189fdf183281c0d7397962f93168379ebca25f9581a30 -size 3362 +oid sha256:d6cb3e1b2d44927f300877c63c4181dabe08861bcc085ecfa9dee40e145af2cf +size 2504 diff --git a/Code/Tools/Android/ProjectBuilder/app_icon-xxhdpi.png b/Code/Tools/Android/ProjectBuilder/app_icon-xxhdpi.png index 22377287e0..31040ec5f0 100644 --- a/Code/Tools/Android/ProjectBuilder/app_icon-xxhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_icon-xxhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02392ac01615ce21710b8566085941fea67926cab062ac2a4c7cdfc594aff428 -size 5482 +oid sha256:746bc5803e8d5dd84b5c255211d167f61beac1c4f9a5a206edff340610fffe7d +size 3247 diff --git a/Code/Tools/Android/ProjectBuilder/app_icon-xxxhdpi.png b/Code/Tools/Android/ProjectBuilder/app_icon-xxxhdpi.png index 0865a8aefe..26befea352 100644 --- a/Code/Tools/Android/ProjectBuilder/app_icon-xxxhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_icon-xxxhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3636ef346cf87d2382ed67ef0a7396bfe3b4df13f9ef223b1911e96ef42ae2ec -size 8238 +oid sha256:1f93be4cff524be96f0fdd2f2bc5c233b8c1391bb8c47abacd028026ed7ce672 +size 3887 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-land-hdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-land-hdpi.png index 26031247c0..d268992f95 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-land-hdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-land-hdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df22836ffc2ab5cca07c6e0d152ed8ef01d56d66cdc56435d6b48304753c4990 -size 196450 +oid sha256:c40fdabfe1391421cef0c1d7fb3e5b2173aac29d6aaf664ed54b9c39aee5e077 +size 17714 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-land-mdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-land-mdpi.png index adcc747bb3..9617f899aa 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-land-mdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-land-mdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70250143d6b53978c7a164330c38cf34777688b92e0def691b68777be111ac75 -size 156821 +oid sha256:22c800b9b1ea513c93162e5549492b2841bc9c8bf94b1a9273f26be1dd4e4517 +size 16494 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-land-xhdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-land-xhdpi.png index 9e0debe587..48f9445b92 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-land-xhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-land-xhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80752114b225ad43028278ac8372cbf4543f493a55e5fe05c24ff1e20f9b24b5 -size 324436 +oid sha256:264aff020a8bc1665aaddaec10e4e453b1a551b4c84c08fddbb315c5aa7202c1 +size 33469 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-land-xxhdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-land-xxhdpi.png index 146187f256..c0a1d4222e 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-land-xxhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-land-xxhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44de927141f19e10672012a8e0675d03fd06e6b20d5a7c759cdc233a1262ef55 -size 441038 +oid sha256:6dded39dd078168e92f1fd47e4728f99f06a6a988a57d5e56ddc0eeb3d4985ef +size 50380 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-port-hdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-port-hdpi.png index cc7786f5d8..406656bf4b 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-port-hdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-port-hdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3fb185179d26442087087401dd96443ed094122b8b7a1b7985aae299764bcf6 -size 271782 +oid sha256:de82dd62268697af0a02dbfad1cd37f153cc0dc08a2d40cec0bbf4fe582fcb50 +size 16257 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-port-mdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-port-mdpi.png index 69359ba77a..bb56cc07aa 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-port-mdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-port-mdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04c9bc74b51d3bd7cf85e178b15c631fd78c6251ef014a41506f36852ec4a500 -size 209127 +oid sha256:70a234b518d00b6be6459f2731d84c23271683d72b775909683ea3b5738d3313 +size 13053 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-port-xhdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-port-xhdpi.png index f9e11d5226..97a4d3eb89 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-port-xhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-port-xhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:913fdddb651ff6d74fb0583b06c6f32f6c87bf9eabe4b861d662c9c409cff733 -size 461061 +oid sha256:0cc200156f762ee8101b8b9eb3d6640c130a889b4507f95eb160524109bfde1d +size 27508 diff --git a/Code/Tools/Android/ProjectBuilder/app_splash-port-xxhdpi.png b/Code/Tools/Android/ProjectBuilder/app_splash-port-xxhdpi.png index 6f5d2cc747..713324b502 100644 --- a/Code/Tools/Android/ProjectBuilder/app_splash-port-xxhdpi.png +++ b/Code/Tools/Android/ProjectBuilder/app_splash-port-xxhdpi.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb9fd81fb4ad83132db7401fe412cce61bf0577e1822653115930f31f3db6241 -size 570118 +oid sha256:c6b01162660664b097ce26ffef1c4171b33565b380f58064c78980335617ca5e +size 42415 diff --git a/Code/Tools/AssetBundler/tests/DummyProject/project.json b/Code/Tools/AssetBundler/tests/DummyProject/project.json index 84edbe781b..104dbc430c 100644 --- a/Code/Tools/AssetBundler/tests/DummyProject/project.json +++ b/Code/Tools/AssetBundler/tests/DummyProject/project.json @@ -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" diff --git a/Code/Tools/AzTestRunner/Platform/Android/android_project.json b/Code/Tools/AzTestRunner/Platform/Android/android_project.json index 890c0172fc..85ce2700a6 100644 --- a/Code/Tools/AzTestRunner/Platform/Android/android_project.json +++ b/Code/Tools/AzTestRunner/Platform/Android/android_project.json @@ -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", diff --git a/Code/Tools/AzTestRunner/Platform/iOS/Resources/Info.plist b/Code/Tools/AzTestRunner/Platform/iOS/Resources/Info.plist index 7e90864dc0..1ecb0cf2c1 100644 --- a/Code/Tools/AzTestRunner/Platform/iOS/Resources/Info.plist +++ b/Code/Tools/AzTestRunner/Platform/iOS/Resources/Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable AzTestRunner CFBundleIdentifier - com.lumberyard.tests + org.o3de.tests CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp index fd91c84c12..9906b0f8c2 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp @@ -22,7 +22,7 @@ namespace LmbrCentral { AZ_CLASS_ALLOCATOR_IMPL(EditorTubeShapeComponentMode, AZ::SystemAllocator, 0) - static const AZ::Crc32 s_resetVariableRadii = AZ_CRC("com.o3de.action.tubeshape.reset_radii", 0xa987659c); + static const AZ::Crc32 s_resetVariableRadii = AZ_CRC_CE("org.o3de.action.tubeshape.reset_radii"); static const char* const s_resetRadiiTitle = "Reset Radii"; static const char* const s_resetRadiiDesc = "Reset all variable radius values to the default"; diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index b91b3e5bb9..780a5eaaab 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -27,10 +27,10 @@ namespace PhysX namespace { //! Uri's for shortcut actions. - const AZ::Crc32 SetDimensionsSubModeActionUri = AZ_CRC("com.o3de.action.physx.setdimensionssubmode", 0x508b1781); - const AZ::Crc32 SetOffsetSubModeActionUri = AZ_CRC("com.o3de.action.physx.setoffsetsubmode", 0x777ac743); - const AZ::Crc32 SetRotationSubModeActionUri = AZ_CRC("com.o3de.action.physx.setrotationsubmode", 0xf1a8f3ff); - const AZ::Crc32 ResetSubModeActionUri = AZ_CRC("com.o3de.action.physx.resetsubmode", 0x599d1594); + const AZ::Crc32 SetDimensionsSubModeActionUri = AZ_CRC_CE("org.o3de.action.physx.setdimensionssubmode"); + const AZ::Crc32 SetOffsetSubModeActionUri = AZ_CRC_CE("org.o3de.action.physx.setoffsetsubmode"); + const AZ::Crc32 SetRotationSubModeActionUri = AZ_CRC_CE("org.o3de.action.physx.setrotationsubmode"); + const AZ::Crc32 ResetSubModeActionUri = AZ_CRC_CE("org.o3de.action.physx.resetsubmode"); } // namespace AZ_CLASS_ALLOCATOR_IMPL(ColliderComponentMode, AZ::SystemAllocator, 0); diff --git a/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp b/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp index 08e31a89f0..5a00ee2446 100644 --- a/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/Source/ComponentModes/Joints/JointsComponentMode.cpp @@ -24,47 +24,47 @@ namespace PhysX namespace SubModeData { - const AZ::Crc32 SwitchToTranslationSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtotranslationsubmode"); + const AZ::Crc32 SwitchToTranslationSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtotranslationsubmode"); static const char* TranslationTitle = "Switch to Position Mode"; static const char* TranslationToolTip = "Position Mode - Change the position of the joint."; - const AZ::Crc32 SwitchToRotationSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtorotationsubmode"); + const AZ::Crc32 SwitchToRotationSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtorotationsubmode"); static const char* RotationTitle = "Switch to Rotation Mode"; static const char* RotationToolTip = "Rotation Mode- Change the rotation of the joint."; - const AZ::Crc32 SwitchToMaxForceSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtomaxforce"); + const AZ::Crc32 SwitchToMaxForceSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtomaxforce"); static const char* MaxForceTitle = "Switch to Max Force Mode"; static const char* MaxForceToolTip = "Max Force Mode - Change the maximum force allowed before the joint breaks."; - const AZ::Crc32 SwitchToMaxTorqueSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtomaxtorque"); + const AZ::Crc32 SwitchToMaxTorqueSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtomaxtorque"); static const char* MaxTorqueTitle = "Switch to Max Torque Mode"; static const char* MaxTorqueToolTip = "Max Torque Mode - Change the maximum torque allowed before the joint breaks."; - const AZ::Crc32 SwitchToDampingSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtodamping"); + const AZ::Crc32 SwitchToDampingSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtodamping"); static const char* DampingTitle = "Switch to Damping Mode"; static const char* DampingToolTip = "Damping Mode - Change the damping strength of the joint when beyond the limit."; - const AZ::Crc32 SwitchToStiffnessSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtostiffness"); + const AZ::Crc32 SwitchToStiffnessSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtostiffness"); static const char* StiffnessTitle = "Switch to Stiffness Mode"; static const char* StiffnessToolTip = "Stiffness Mode - Change the stiffness strength of the joint when beyond the limit."; - const AZ::Crc32 SwitchToTwistLimitsSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtotwistlimits"); + const AZ::Crc32 SwitchToTwistLimitsSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtotwistlimits"); static const char* TwistLimitsTitle = "Switch to Twist Limits Mode"; static const char* TwistLimitsToolTip = "Twist Limits Mode - Change the limits of the joint."; - const AZ::Crc32 SwitchToSwingLimitsSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtoswinglimits"); + const AZ::Crc32 SwitchToSwingLimitsSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtoswinglimits"); static const char* SwingLimitsTitle = "Switch to Swing Limits Mode"; static const char* SwingLimitsToolTip = "Swing Limits Mode - Change the limits of the joint."; - const AZ::Crc32 SwitchToSnapPositionSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtosnapposition"); + const AZ::Crc32 SwitchToSnapPositionSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtosnapposition"); static const char* SnapPositionTitle = "Switch to Snap Position Mode"; static const char* SnapPositionToolTip = "Snap Position Mode - Snap the position of the joint to another Entity."; - const AZ::Crc32 SwitchToSnapRotationSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.switchtosnaprotation"); + const AZ::Crc32 SwitchToSnapRotationSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.switchtosnaprotation"); static const char* SnapRotationTitle = "Switch to Snap Rotation Mode"; static const char* SnapRotationToolTip = "Snap Rotation Mode - Snap the rotation of the joint toward another Entity."; - const AZ::Crc32 ResetSubMode = AZ_CRC_CE("com.o3de.action.physx.joints.resetsubmode"); + const AZ::Crc32 ResetSubMode = AZ_CRC_CE("org.o3de.action.physx.joints.resetsubmode"); static const char* ResetTitle = "Reset Current Mode"; static const char* ResetToolTip = "Reset changes made during this mode edit."; diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp index 608605be62..c605364f2c 100644 --- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp +++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp @@ -33,8 +33,8 @@ namespace WhiteBox AZ::Color, cl_whiteBoxVertexIndicatorColor, AZ::Color::CreateFromRgba(0, 0, 0, 102), nullptr, AZ::ConsoleFunctorFlags::Null, "The color of the vertex indicator"); - static const AZ::Crc32 HideEdge = AZ_CRC("com.o3de.action.whitebox.hide_edge", 0x84f6a9b9); - static const AZ::Crc32 HideVertex = AZ_CRC("com.o3de.action.whitebox.hide_vertex", 0x5f81c937); + static const AZ::Crc32 HideEdge = AZ_CRC_CE("org.o3de.action.whitebox.hide_edge"); + static const AZ::Crc32 HideVertex = AZ_CRC_CE("org.o3de.action.whitebox.hide_vertex"); static const char* const HideEdgeTitle = "Hide Edge"; static const char* const HideEdgeDesc = "Hide the selected edge to merge the two connected polygons"; diff --git a/Templates/DefaultProject/Template/Platform/Android/android_project.json b/Templates/DefaultProject/Template/Platform/Android/android_project.json index 99500f02ba..b3ac7ef23a 100644 --- a/Templates/DefaultProject/Template/Platform/Android/android_project.json +++ b/Templates/DefaultProject/Template/Platform/Android/android_project.json @@ -1,7 +1,7 @@ { "Tags": ["Android"], "android_settings" : { - "package_name" : "com.lumberyard.${Name}", + "package_name" : "org.o3de.${Name}", "version_number" : 1, "version_name" : "1.0.0.0", "orientation" : "landscape" diff --git a/Templates/MinimalProject/Template/Platform/Android/android_project.json b/Templates/MinimalProject/Template/Platform/Android/android_project.json index 99500f02ba..b3ac7ef23a 100644 --- a/Templates/MinimalProject/Template/Platform/Android/android_project.json +++ b/Templates/MinimalProject/Template/Platform/Android/android_project.json @@ -1,7 +1,7 @@ { "Tags": ["Android"], "android_settings" : { - "package_name" : "com.lumberyard.${Name}", + "package_name" : "org.o3de.${Name}", "version_number" : 1, "version_name" : "1.0.0.0", "orientation" : "landscape" diff --git a/cmake/Platform/iOS/LYWrappers_ios.cmake b/cmake/Platform/iOS/LYWrappers_ios.cmake index 7ad2df9d67..2ea2dd4735 100644 --- a/cmake/Platform/iOS/LYWrappers_ios.cmake +++ b/cmake/Platform/iOS/LYWrappers_ios.cmake @@ -19,8 +19,8 @@ function(ly_apply_platform_properties target) set_target_properties(${target} PROPERTIES FRAMEWORK TRUE - MACOSX_FRAMEWORK_IDENTIFIER "com.lumberyard.lib.${target_name}" - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.lumberyard.lib.${target_name}" + MACOSX_FRAMEWORK_IDENTIFIER "org.o3de.lib.${target_name}" + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.o3de.lib.${target_name}" XCODE_ATTRIBUTE_SKIP_INSTALL "YES" ) endif() diff --git a/cmake/Tools/Platform/Android/android_deployment.py b/cmake/Tools/Platform/Android/android_deployment.py index 1d02a086dc..adb5f827f9 100755 --- a/cmake/Tools/Platform/Android/android_deployment.py +++ b/cmake/Tools/Platform/Android/android_deployment.py @@ -415,7 +415,7 @@ class AndroidDeployment(object): android_package_name = android_support.TEST_RUNNER_PACKAGE_NAME else: android_package_name = self.get_android_project_settings(key_name='package_name', - default_value='com.lumberyard.sdk') + default_value='org.o3de.sdk') if self.clean_deploy and self.check_package_installed(android_package_name, target_device): logging.info(f"Device '{target_device}': Uninstalling pre-existing APK for {self.game_name} ...") @@ -436,7 +436,7 @@ class AndroidDeployment(object): assert not self.is_test_project android_package_name = self.get_android_project_settings(key_name='package_name', - default_value='com.lumberyard.sdk') + default_value='org.o3de.sdk') relative_assets_path = f'Android/data/{android_package_name}/files' output_target = f'{detected_storage}/{relative_assets_path}' device_timestamp_file = f'{output_target}/{ANDROID_TARGET_TIMESTAMP_FILENAME}' @@ -539,7 +539,7 @@ class AndroidDeployment(object): if self.deployment_type == AndroidDeployment.DEPLOY_ASSETS_ONLY: # If we are deploying assets only without an APK, make sure the APK is even installed first android_package_name = self.get_android_project_settings(key_name='package_name', - default_value='com.lumberyard.sdk') + default_value='org.o3de.sdk') if not self.check_package_installed(package_name=android_package_name, target_device=target_device): raise common.LmbrCmdError(f"Unable to locate APK for {self.game_name} on device '{target_device}'. Make sure it is installed " diff --git a/cmake/Tools/Platform/Android/android_support.py b/cmake/Tools/Platform/Android/android_support.py index 657ef3b3e4..30615c4cb9 100755 --- a/cmake/Tools/Platform/Android/android_support.py +++ b/cmake/Tools/Platform/Android/android_support.py @@ -61,7 +61,7 @@ DEFAULT_CONFIG_CHANGES = [ ] TEST_RUNNER_PROJECT = 'AzTestRunner' -TEST_RUNNER_PACKAGE_NAME = 'com.lumberyard.tests' +TEST_RUNNER_PACKAGE_NAME = 'org.o3de.tests' # Android Orientation Constants ORIENTATION_LANDSCAPE = 1 << 0 diff --git a/cmake/Tools/Platform/Android/launch_android_test.py b/cmake/Tools/Platform/Android/launch_android_test.py index 091e3c2cb9..3704805831 100755 --- a/cmake/Tools/Platform/Android/launch_android_test.py +++ b/cmake/Tools/Platform/Android/launch_android_test.py @@ -89,14 +89,14 @@ def launch_test_on_device(adb_tool, test_module, timeout_secs, test_filter): """ # Clear user data before each test - adb_tool.exec(['shell', 'pm', 'clear', 'com.lumberyard.tests']) + adb_tool.exec(['shell', 'pm', 'clear', 'org.o3de.tests']) # Increase the log buffer to prevent 'end of file' error from logcat adb_tool.exec(['shell', 'logcat', '-G', f'{LOGCAT_BUFFER_SIZE_MB}M']) # Start the test activity exec_args = ['shell', 'am', 'start', - '-n', f'com.lumberyard.tests/.{TEST_ACTIVITY}', + '-n', f'org.o3de.tests/.{TEST_ACTIVITY}', '--es', test_module, 'AzRunUnitTests', '--es', 'startdelay', str(TEST_RUNNER_STARTUP_DELAY)] if test_filter: @@ -117,7 +117,7 @@ def launch_test_on_device(adb_tool, test_module, timeout_secs, test_filter): # Make multiple attempts to get the PID of the test process max_pid_retries = 5 while max_pid_retries > 0: - ret, result_pid, _ = adb_tool.exec(['shell', 'pidof', '-s', 'com.lumberyard.tests'], capture_stdout=True) + ret, result_pid, _ = adb_tool.exec(['shell', 'pidof', '-s', 'org.o3de.tests'], capture_stdout=True) if ret == 0: break time.sleep(1) @@ -139,7 +139,7 @@ def launch_test_on_device(adb_tool, test_module, timeout_secs, test_filter): break # Break out of the loop in case the process dies unexpectly - ret, _, _ = adb_tool.exec(['shell', 'pidof', '-s', 'com.lumberyard.tests'], capture_stdout=True) + ret, _, _ = adb_tool.exec(['shell', 'pidof', '-s', 'org.o3de.tests'], capture_stdout=True) if ret != 0: break @@ -161,7 +161,7 @@ def launch_test_on_device(adb_tool, test_module, timeout_secs, test_filter): if result_pid: adb_tool.exec(['shell', 'logcat', f'--pid={result_pid}', '-c']) # Kill the test launcher process - adb_tool.exec(['shell', 'am', 'force-stop', 'com.lumberyard.tests']) + adb_tool.exec(['shell', 'am', 'force-stop', 'org.o3de.tests']) time.sleep(2) return tests_passed diff --git a/cmake/Tools/Platform/Android/unit_test_android_deployment.py b/cmake/Tools/Platform/Android/unit_test_android_deployment.py index 1bbc0e8ff8..f3755ed7d4 100755 --- a/cmake/Tools/Platform/Android/unit_test_android_deployment.py +++ b/cmake/Tools/Platform/Android/unit_test_android_deployment.py @@ -586,14 +586,14 @@ def test_update_device_file_timestamp(tmpdir): @pytest.mark.parametrize( "test_config, test_package_name, test_device_storage_path", [ - pytest.param('profile', 'com.amazon.lumberyard.foo', '/data/fool_storage'), - pytest.param('debug', 'com.amazon.lumberyard.foo', '/data/fool_storage'), - pytest.param('profile', 'com.amazon.lumberyard.bar', '/data/fool_storage'), - pytest.param('debug', 'com.amazon.lumberyard.bar', '/data/fool_storage'), - pytest.param('profile', 'com.amazon.lumberyard.foo', '/data/fool_storage2'), - pytest.param('debug', 'com.amazon.lumberyard.foo', '/data/fool_storage2'), - pytest.param('profile', 'com.amazon.lumberyard.bar', '/data/fool_storage2'), - pytest.param('debug', 'com.amazon.lumberyard.bar', '/data/fool_storage2') + pytest.param('profile', 'org.o3de.foo', '/data/fool_storage'), + pytest.param('debug', 'org.o3de.foo', '/data/fool_storage'), + pytest.param('profile', 'org.o3de.bar', '/data/fool_storage'), + pytest.param('debug', 'org.o3de.bar', '/data/fool_storage'), + pytest.param('profile', 'org.o3de.foo', '/data/fool_storage2'), + pytest.param('debug', 'org.o3de.foo', '/data/fool_storage2'), + pytest.param('profile', 'org.o3de.bar', '/data/fool_storage2'), + pytest.param('debug', 'org.o3de.bar', '/data/fool_storage2') ] ) def test_execute_success(tmpdir, test_config, test_package_name, test_device_storage_path): @@ -658,14 +658,14 @@ def test_execute_success(tmpdir, test_config, test_package_name, test_device_sto @pytest.mark.parametrize( "test_game_name, test_config, test_package_name, test_device_storage_path, test_asset_type", [ - pytest.param('game1','profile', 'com.amazon.lumberyard.foo', '/data/fool_storage', 'android'), - pytest.param('game1','debug', 'com.amazon.lumberyard.foo', '/data/fool_storage', 'android'), - pytest.param('game2','profile', 'com.amazon.lumberyard.bar', '/data/fool_storage', 'android'), - pytest.param('game2','debug', 'com.amazon.lumberyard.bar', '/data/fool_storage', 'android'), - pytest.param('game3','profile', 'com.amazon.lumberyard.foo', '/data/fool_storage2', 'pc'), - pytest.param('game3','debug', 'com.amazon.lumberyard.foo', '/data/fool_storage2', 'pc'), - pytest.param('game4','profile', 'com.amazon.lumberyard.bar', '/data/fool_storage2', 'pc'), - pytest.param('game4','debug', 'com.amazon.lumberyard.bar', '/data/fool_storage2', 'pc') + pytest.param('game1','profile', 'org.o3de.foo', '/data/fool_storage', 'android'), + pytest.param('game1','debug', 'org.o3de.foo', '/data/fool_storage', 'android'), + pytest.param('game2','profile', 'org.o3de.bar', '/data/fool_storage', 'android'), + pytest.param('game2','debug', 'org.o3de.bar', '/data/fool_storage', 'android'), + pytest.param('game3','profile', 'org.o3de.foo', '/data/fool_storage2', 'pc'), + pytest.param('game3','debug', 'org.o3de.foo', '/data/fool_storage2', 'pc'), + pytest.param('game4','profile', 'org.o3de.bar', '/data/fool_storage2', 'pc'), + pytest.param('game4','debug', 'org.o3de.bar', '/data/fool_storage2', 'pc') ] ) def test_execute_clean_deploy_success(tmpdir, test_game_name, test_config, test_package_name, test_device_storage_path, test_asset_type): @@ -754,14 +754,14 @@ def test_execute_clean_deploy_success(tmpdir, test_game_name, test_config, test_ @pytest.mark.parametrize( "test_config, test_package_name, test_device_storage_path", [ - pytest.param('profile', 'com.amazon.lumberyard.foo', '/data/fool_storage'), - pytest.param('debug', 'com.amazon.lumberyard.foo', '/data/fool_storage'), - pytest.param('profile', 'com.amazon.lumberyard.bar', '/data/fool_storage'), - pytest.param('debug', 'com.amazon.lumberyard.bar', '/data/fool_storage'), - pytest.param('profile', 'com.amazon.lumberyard.foo', '/data/fool_storage2'), - pytest.param('debug', 'com.amazon.lumberyard.foo', '/data/fool_storage2'), - pytest.param('profile', 'com.amazon.lumberyard.bar', '/data/fool_storage2'), - pytest.param('debug', 'com.amazon.lumberyard.bar', '/data/fool_storage2') + pytest.param('profile', 'org.o3de.foo', '/data/fool_storage'), + pytest.param('debug', 'org.o3de.foo', '/data/fool_storage'), + pytest.param('profile', 'org.o3de.bar', '/data/fool_storage'), + pytest.param('debug', 'org.o3de.bar', '/data/fool_storage'), + pytest.param('profile', 'org.o3de.foo', '/data/fool_storage2'), + pytest.param('debug', 'org.o3de.foo', '/data/fool_storage2'), + pytest.param('profile', 'org.o3de.bar', '/data/fool_storage2'), + pytest.param('debug', 'org.o3de.bar', '/data/fool_storage2') ] ) def test_execute_incremental_deploy_success(tmpdir, test_config, test_package_name, test_device_storage_path): diff --git a/cmake/Tools/common.py b/cmake/Tools/common.py index cd42d8c818..0770099bab 100755 --- a/cmake/Tools/common.py +++ b/cmake/Tools/common.py @@ -122,9 +122,9 @@ def determine_engine_root(starting_path=None): def get_config_file_values(config_file_path, keys_to_extract): """ - Read a lumberyard config file and extract specific keys if they are set + Read an o3de config file and extract specific keys if they are set - @param config_file_path: The lumberyard config file to parse + @param config_file_path: The o3de config file to parse @param keys_to_extract: The specific keys to lookup the values if set @return: Dictionary of keys and its values (for matched keys) """ diff --git a/cmake/Tools/unit_test_common.py b/cmake/Tools/unit_test_common.py index 9b53d273fe..8d66aac769 100755 --- a/cmake/Tools/unit_test_common.py +++ b/cmake/Tools/unit_test_common.py @@ -173,7 +173,7 @@ TEST_GAME_PROJECT_JSON_FORMAT = """ "project_id": "{{4F3363D3-4A7C-47A6-B464-B21524771358}}", "android_settings" : {{ - "package_name" : "com.lumberyard.yourgame", + "package_name" : "org.o3de.yourgame", "version_number" : 1, "version_name" : "1.0.0.0", "orientation" : "landscape"