Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/scriptcanvas/prefabs

Code/Editor/CryEdit.cpp

@@ -2302,13 +2302,6 @@ int CCryEditApp::IdleProcessing(bool bBackgroundUpdate)
 
     m_bPrevActive = bActive;
 
-    AZStd::chrono::system_clock::time_point now = AZStd::chrono::system_clock::now();
-    static AZStd::chrono::system_clock::time_point lastUpdate = now;
-
-    AZStd::chrono::duration<float> delta = now - lastUpdate;
-
-    lastUpdate = now;
-
     // Don't tick application if we're doing idle processing during an assert.
     const bool isErrorWindowVisible = (gEnv && gEnv->pSystem->IsAssertDialogVisible());
     if (isErrorWindowVisible)
@@ -2320,30 +2313,24 @@ int CCryEditApp::IdleProcessing(bool bBackgroundUpdate)
     }
     else if (bActive || (bBackgroundUpdate && !bIsAppWindow))
     {
-        if (GetIEditor()->IsInGameMode())
-        {
-            // Update Game
-            GetIEditor()->GetGameEngine()->Update();
-        }
-        else
-        {
-            GetIEditor()->GetGameEngine()->Update();
+        // Update Game
+        GetIEditor()->GetGameEngine()->Update();
 
+        if (!GetIEditor()->IsInGameMode())
+        {
             if (m_pEditor)
             {
                 m_pEditor->Update();
             }
 
             GetIEditor()->Notify(eNotify_OnIdleUpdate);
+        }
 
-            // Since the rendering is done based on the eNotify_OnIdleUpdate, we should trigger a TickSystem as well.
-            // To ensure that there's a system tick for every render done in Idle
-            AZ::ComponentApplication* componentApplication = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationRequests::GetApplication);
-            if (componentApplication)
-            {
-                componentApplication->TickSystem();
-            }
+        AZ::ComponentApplication* componentApplication = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationRequests::GetApplication);
+        if (componentApplication)
+        {
+            componentApplication->TickSystem();
         }
     }
     else if (GetIEditor()->GetSystem() && GetIEditor()->GetSystem()->GetILog())

Code/Editor/MainWindow.cpp

@@ -489,11 +489,6 @@ void MainWindow::Initialize()
     ActionOverrideRequestBus::Event(
         GetEntityContextId(), &ActionOverrideRequests::SetupActionOverrideHandler, this);
 
-    // This function only happens after we're pretty sure that the engine has successfully started - so now would be a good time to start ticking the message pumps/etc.
-    AzToolsFramework::Ticker* ticker = new AzToolsFramework::Ticker(this);
-    ticker->Start();
-    connect(ticker, &AzToolsFramework::Ticker::Tick, this, &MainWindow::SystemTick);
-
     AzToolsFramework::EditorEventsBus::Broadcast(&AzToolsFramework::EditorEvents::NotifyMainWindowInitialized, this);
 }
 

Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp

@@ -34,6 +34,28 @@ namespace AzPhysics
     const CollisionGroup CollisionGroup::All_NoTouchBend = CollisionGroup::All.GetMask() & ~CollisionLayer::TouchBend.GetMask();
 #endif
 
+    void CollisionGroupScriptConstructor(CollisionGroup* thisPtr, AZ::ScriptDataContext& scriptDataContext)
+    {
+        if (int numArgs = scriptDataContext.GetNumArguments();
+            numArgs != 1)
+        {
+            scriptDataContext.GetScriptContext()->Error(AZ::ScriptContext::ErrorType::Error, true,
+                "CollisionGroup() accepts only 1 argument, not %d", numArgs);
+            return;
+        }
+
+        if (!scriptDataContext.IsString(0))
+        {
+            scriptDataContext.GetScriptContext()->Error(AZ::ScriptContext::ErrorType::Error, true,
+                "Argument to CollisionGroup() should be string");
+            return;
+        }
+
+        AZStd::string groupName;
+        scriptDataContext.ReadArg(0, groupName);
+        *thisPtr = CollisionGroup(groupName);
+    }
+
     void CollisionGroup::Reflect(AZ::ReflectContext* context)
     {
         if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
@@ -50,7 +72,9 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "AzPhysics")
-                ->Constructor<const AZStd::string>()
+                ->Constructor<const AZStd::string&>()
+                ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
+                ->Attribute(AZ::Script::Attributes::ConstructorOverride, &CollisionGroupScriptConstructor)
                 ;
         }
     }

Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp

@@ -88,6 +88,19 @@ namespace AzPhysics
                     ;
             }
         }
+
+        if (auto* behaviorContext = azdynamic_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<SceneQueryRequest>("SceneQueryRequest")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Property("Collision", BehaviorValueProperty(&SceneQueryRequest::m_collisionGroup))
+                // Until enum class support for behavior context is done, expose this as an int
+                ->Property("QueryType", [](const SceneQueryRequest& self) { return static_cast<int>(self.m_queryType); },
+                    [](SceneQueryRequest& self, int newQueryType) { self.m_queryType = SceneQuery::QueryType(newQueryType); })
+                ;
+        }
     }
 
     /*static*/ void RayCastRequest::Reflect(AZ::ReflectContext* context)
@@ -123,10 +136,6 @@ namespace AzPhysics
                 ->Property("Distance", BehaviorValueProperty(&RayCastRequest::m_distance))
                 ->Property("Start", BehaviorValueProperty(&RayCastRequest::m_start))
                 ->Property("Direction", BehaviorValueProperty(&RayCastRequest::m_direction))
-                ->Property("Collision", BehaviorValueProperty(&RayCastRequest::m_collisionGroup))
-                // Until enum class support for behavior context is done, expose this as an int
-                ->Property("QueryType", [](const RayCastRequest& self) { return static_cast<int>(self.m_queryType); },
-                    [](RayCastRequest& self, int newQueryType) { self.m_queryType = SceneQuery::QueryType(newQueryType); })
                 ;
         }
     }

Code/Framework/AzFramework/AzFramework/Physics/Utils.cpp

@@ -73,21 +73,22 @@ namespace Physics
         {
             if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
             {
-                behaviorContext->EBus<Physics::CharacterRequestBus>("CharacterControllerRequestBus", "Character Controller")
-                    ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::RuntimeOwn)
+                behaviorContext->EBus<CharacterRequestBus>("CharacterControllerRequestBus")
+                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                    ->Attribute(AZ::Script::Attributes::Module, "physics")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Event("GetBasePosition", &Physics::CharacterRequests::GetBasePosition, "Get Base Position")
-                    ->Event("SetBasePosition", &Physics::CharacterRequests::SetBasePosition, "Set Base Position")
-                    ->Event("GetCenterPosition", &Physics::CharacterRequests::GetCenterPosition, "Get Center Position")
-                    ->Event("GetStepHeight", &Physics::CharacterRequests::GetStepHeight, "Get Step Height")
-                    ->Event("SetStepHeight", &Physics::CharacterRequests::SetStepHeight, "Set Step Height")
-                    ->Event("GetUpDirection", &Physics::CharacterRequests::GetUpDirection, "Get Up Direction")
-                    ->Event("GetSlopeLimitDegrees", &Physics::CharacterRequests::GetSlopeLimitDegrees, "Get Slope Limit (Degrees)")
-                    ->Event("SetSlopeLimitDegrees", &Physics::CharacterRequests::SetSlopeLimitDegrees, "Set Slope Limit (Degrees)")
-                    ->Event("GetMaximumSpeed", &Physics::CharacterRequests::GetMaximumSpeed, "Get Maximum Speed")
-                    ->Event("SetMaximumSpeed", &Physics::CharacterRequests::SetMaximumSpeed, "Set Maximum Speed")
-                    ->Event("GetVelocity", &Physics::CharacterRequests::GetVelocity, "Get Velocity")
-                    ->Event("AddVelocity", &Physics::CharacterRequests::AddVelocity, "Add Velocity")
+                    ->Event("GetBasePosition", &CharacterRequests::GetBasePosition, "Get Base Position")
+                    ->Event("SetBasePosition", &CharacterRequests::SetBasePosition, "Set Base Position")
+                    ->Event("GetCenterPosition", &CharacterRequests::GetCenterPosition, "Get Center Position")
+                    ->Event("GetStepHeight", &CharacterRequests::GetStepHeight, "Get Step Height")
+                    ->Event("SetStepHeight", &CharacterRequests::SetStepHeight, "Set Step Height")
+                    ->Event("GetUpDirection", &CharacterRequests::GetUpDirection, "Get Up Direction")
+                    ->Event("GetSlopeLimitDegrees", &CharacterRequests::GetSlopeLimitDegrees, "Get Slope Limit (Degrees)")
+                    ->Event("SetSlopeLimitDegrees", &CharacterRequests::SetSlopeLimitDegrees, "Set Slope Limit (Degrees)")
+                    ->Event("GetMaximumSpeed", &CharacterRequests::GetMaximumSpeed, "Get Maximum Speed")
+                    ->Event("SetMaximumSpeed", &CharacterRequests::SetMaximumSpeed, "Set Maximum Speed")
+                    ->Event("GetVelocity", &CharacterRequests::GetVelocity, "Get Velocity")
+                    ->Event("AddVelocity", &CharacterRequests::AddVelocity, "Add Velocity")
                     ;
             }
         }

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp

@@ -488,6 +488,13 @@ namespace AzToolsFramework
         return worldFromLocal.TransformPoint(CalculateCenterOffset(entityId, pivot));
     }
 
+    void EditorTransformComponentSelection::SetAllViewportUiVisible(const bool visible)
+    {
+        SetViewportUiClusterVisible(m_transformModeClusterId, visible);
+        SetViewportUiClusterVisible(m_spaceCluster.m_spaceClusterId, visible);
+        m_viewportUiVisible = visible;
+    }
+
     void EditorTransformComponentSelection::UpdateSpaceCluster(const ReferenceFrame referenceFrame)
     {
         auto buttonIdFromFrameFn = [this](const ReferenceFrame referenceFrame)
@@ -1009,6 +1016,7 @@ namespace AzToolsFramework
         ToolsApplicationNotificationBus::Handler::BusConnect();
         Camera::EditorCameraNotificationBus::Handler::BusConnect();
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(entityContextId);
+        EditorEntityContextNotificationBus::Handler::BusConnect();
         EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
         EditorEntityLockComponentNotificationBus::Router::BusRouterConnect();
         EditorManipulatorCommandUndoRedoRequestBus::Handler::BusConnect(entityContextId);
@@ -1037,6 +1045,7 @@ namespace AzToolsFramework
         EditorManipulatorCommandUndoRedoRequestBus::Handler::BusDisconnect();
         EditorEntityLockComponentNotificationBus::Router::BusRouterDisconnect();
         EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
+        EditorEntityContextNotificationBus::Handler::BusDisconnect();
         ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
         Camera::EditorCameraNotificationBus::Handler::BusDisconnect();
         ToolsApplicationNotificationBus::Handler::BusDisconnect();
@@ -2387,9 +2396,7 @@ namespace AzToolsFramework
             /*ID_VIEWPORTUI_VISIBLE=*/50040, "Toggle Viewport UI", "Hide/Show Viewport UI",
             [this]()
             {
-                SetViewportUiClusterVisible(m_transformModeClusterId, !m_viewportUiVisible);
-                SetViewportUiClusterVisible(m_spaceCluster.m_spaceClusterId, !m_viewportUiVisible);
-                m_viewportUiVisible = !m_viewportUiVisible;
+                SetAllViewportUiVisible(!m_viewportUiVisible);
             });
 
         EditorMenuRequestBus::Broadcast(&EditorMenuRequests::RestoreEditMenuToDefault);
@@ -3560,7 +3567,7 @@ namespace AzToolsFramework
 
     void EditorTransformComponentSelection::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
     {
-        SetViewportUiClusterVisible(m_transformModeClusterId, false);
+        SetAllViewportUiVisible(false);
 
         EditorEntityLockComponentNotificationBus::Router::BusRouterDisconnect();
         EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
@@ -3569,7 +3576,7 @@ namespace AzToolsFramework
 
     void EditorTransformComponentSelection::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
     {
-        SetViewportUiClusterVisible(m_transformModeClusterId, true);
+        SetAllViewportUiVisible(true);
 
         ToolsApplicationNotificationBus::Handler::BusConnect();
         EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
@@ -3625,6 +3632,16 @@ namespace AzToolsFramework
         ETCS::SetEntityLocalRotation(entityId, localRotation, m_transformChangedInternally);
     }
 
+    void EditorTransformComponentSelection::OnStartPlayInEditor()
+    {
+        SetAllViewportUiVisible(false);
+    }
+
+    void EditorTransformComponentSelection::OnStopPlayInEditor()
+    {
+        SetAllViewportUiVisible(true);
+    }
+
     namespace ETCS
     {
         // little raii wrapper to switch a value from true to false and back

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h

@@ -128,6 +128,7 @@ namespace AzToolsFramework
         , private ToolsApplicationNotificationBus::Handler
         , private Camera::EditorCameraNotificationBus::Handler
         , private ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+        , private EditorEntityContextNotificationBus::Handler
         , private EditorEntityVisibilityNotificationBus::Router
         , private EditorEntityLockComponentNotificationBus::Router
         , private EditorManipulatorCommandUndoRedoRequestBus::Handler
@@ -264,6 +265,10 @@ namespace AzToolsFramework
         void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
         void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
 
+        // EditorEntityContextNotificationBus overrides ...
+        void OnStartPlayInEditor() override;
+        void OnStopPlayInEditor() override;
+
         // Helpers to safely interact with the TransformBus (requests).
         void SetEntityWorldTranslation(AZ::EntityId entityId, const AZ::Vector3& worldTranslation);
         void SetEntityLocalTranslation(AZ::EntityId entityId, const AZ::Vector3& localTranslation);
@@ -271,9 +276,12 @@ namespace AzToolsFramework
         void SetEntityLocalScale(AZ::EntityId entityId, float localScale);
         void SetEntityLocalRotation(AZ::EntityId entityId, const AZ::Vector3& localRotation);
 
-        // Responsible for keeping the space cluster in sync with the current reference frame.
+        //! Responsible for keeping the space cluster in sync with the current reference frame.
         void UpdateSpaceCluster(ReferenceFrame referenceFrame);
 
+        //! Hides/Shows all viewportUi toolbars.
+        void SetAllViewportUiVisible(bool visible);
+
         AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any).
         AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
         AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set.

Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp

@@ -10,6 +10,7 @@
 #include <PythonBindingsInterface.h>
 #include <NewProjectSettingsScreen.h>
 #include <ScreenHeaderWidget.h>
+#include <GemCatalog/GemModel.h>
 #include <GemCatalog/GemCatalogScreen.h>
 
 #include <QDialogButtonBox>
@@ -46,6 +47,40 @@ namespace O3DE::ProjectManager
         m_stack->addWidget(m_gemCatalogScreen);
         vLayout->addWidget(m_stack);
 
+        // When there are multiple project templates present, we re-gather the gems when changing the selected the project template.
+        connect(m_newProjectSettingsScreen, &NewProjectSettingsScreen::OnTemplateSelectionChanged, this, [=](int oldIndex, [[maybe_unused]] int newIndex)
+            {
+                const GemModel* gemModel = m_gemCatalogScreen->GetGemModel();
+                const QVector<QModelIndex> toBeAdded = gemModel->GatherGemsToBeAdded();
+                const QVector<QModelIndex> toBeRemoved = gemModel->GatherGemsToBeRemoved();
+                if (!toBeAdded.isEmpty() || !toBeRemoved.isEmpty())
+                {
+                    // In case the user enabled or disabled any gem and the current selection does not match the default from the
+                    // // project template anymore, we need to ask the user if they want to proceed as their modifications will be lost.
+                    const QString title = tr("Modifications will be lost");
+                    const QString text = tr("You selected a new project template after modifying the enabled gems.\n\n"
+                        "All modifications will be lost and the default from the new project template will be used.\n\n"
+                        "Do you want to proceed?");
+                    if (QMessageBox::warning(this, title, text, QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
+                    {
+                        // The users wants to proceed. Reinitialize based on the newly selected project template.
+                        ReinitGemCatalogForSelectedTemplate();
+                    }
+                    else
+                    {
+                        // Roll-back to the previously selected project template and
+                        // block signals so that we don't end up in this same callback again.
+                        m_newProjectSettingsScreen->SelectProjectTemplate(oldIndex, /*blockSignals=*/true);
+                    }
+                }
+                else
+                {
+                    // In case the user did not enable or disable any gem and the currently enabled gems matches the previously selected
+                    // ones from the project template, we can just reinitialize based on the newly selected project template.
+                    ReinitGemCatalogForSelectedTemplate();
+                }
+            });
+
         QDialogButtonBox* buttons = new QDialogButtonBox();
         buttons->setObjectName("footer");
         vLayout->addWidget(buttons);
@@ -81,10 +116,8 @@ namespace O3DE::ProjectManager
             currentScreen->NotifyCurrentScreen();
         }
 
-        // Gather the gems from the project template. When we will have multiple project templates, we need to re-gather them
-        // on changing the template and let the user know that any further changes on top of the template will be lost.
-        QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
-        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
+        // Gather the enabled gems from the default project template when starting the create new project workflow.
+        ReinitGemCatalogForSelectedTemplate();
     }
 
     void CreateProjectCtrl::HandleBackButton()
@@ -223,4 +256,9 @@ namespace O3DE::ProjectManager
         }
     }
 
+    void CreateProjectCtrl::ReinitGemCatalogForSelectedTemplate()
+    {
+        const QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
+        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/CreateProjectCtrl.h

@@ -40,6 +40,7 @@ namespace O3DE::ProjectManager
 #ifdef TEMPLATE_GEM_CONFIGURATION_ENABLED
         void OnChangeScreenRequest(ProjectManagerScreen screen);
         void HandleSecondaryButton();
+        void ReinitGemCatalogForSelectedTemplate();
 #endif // TEMPLATE_GEM_CONFIGURATION_ENABLED
 
     private:

Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp

@@ -21,4 +21,9 @@ namespace O3DE::ProjectManager
         connect(browseButton, &QPushButton::pressed, this, &FormBrowseEditWidget::HandleBrowseButton);
         m_frameLayout->addWidget(browseButton); 
     }
+
+    FormBrowseEditWidget::FormBrowseEditWidget(const QString& labelText, QWidget* parent)
+        : FormBrowseEditWidget(labelText, "", parent)
+    {
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h

@@ -20,6 +20,7 @@ namespace O3DE::ProjectManager
 
     public:
         explicit FormBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
+        explicit FormBrowseEditWidget(const QString& labelText = "", QWidget* parent = nullptr);
         ~FormBrowseEditWidget() = default;
 
     protected slots:

Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp

@@ -15,8 +15,9 @@
 namespace O3DE::ProjectManager
 {
     FormFolderBrowseEditWidget::FormFolderBrowseEditWidget(const QString& labelText, const QString& valueText, QWidget* parent)
-        : FormBrowseEditWidget(labelText, valueText, parent)
+        : FormBrowseEditWidget(labelText, parent)
     {
+        setText(valueText);
     }
 
     void FormFolderBrowseEditWidget::HandleBrowseButton()
@@ -30,8 +31,14 @@ namespace O3DE::ProjectManager
         QString directory = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(this, tr("Browse"), defaultPath));
         if (!directory.isEmpty())
         {
-            m_lineEdit->setText(directory);
+            setText(directory);
         }
 
     }
+
+    void FormFolderBrowseEditWidget::setText(const QString& text)
+    {
+        QString path = QDir::toNativeSeparators(text);
+        FormBrowseEditWidget::setText(path);
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.h

@@ -22,6 +22,8 @@ namespace O3DE::ProjectManager
         explicit FormFolderBrowseEditWidget(const QString& labelText, const QString& valueText = "", QWidget* parent = nullptr);
         ~FormFolderBrowseEditWidget() = default;
 
+        void setText(const QString& text) override;
+
     protected:
         void HandleBrowseButton() override;
     };

Code/Tools/ProjectManager/Source/FormLineEditWidget.cpp

@@ -123,4 +123,14 @@ namespace O3DE::ProjectManager
             child->style()->polish(child);
         }
     }
+
+    void FormLineEditWidget::setText(const QString& text)
+    {
+        m_lineEdit->setText(text);
+    }
+
+    void FormLineEditWidget::mousePressEvent([[maybe_unused]] QMouseEvent* event)
+    {
+        m_lineEdit->setFocus();
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormLineEditWidget.h

@@ -15,6 +15,7 @@ QT_FORWARD_DECLARE_CLASS(QLineEdit)
 QT_FORWARD_DECLARE_CLASS(QLabel)
 QT_FORWARD_DECLARE_CLASS(QFrame)
 QT_FORWARD_DECLARE_CLASS(QHBoxLayout)
+QT_FORWARD_DECLARE_CLASS(QMouseEvent)
 
 namespace AzQtComponents
 {
@@ -39,6 +40,8 @@ namespace O3DE::ProjectManager
         //! Returns a pointer to the underlying LineEdit.
         QLineEdit* lineEdit() const;
 
+        virtual void setText(const QString& text);
+
     protected:
         QLabel* m_errorLabel = nullptr;
         QFrame* m_frame = nullptr;
@@ -51,6 +54,8 @@ namespace O3DE::ProjectManager
         void onFocusOut();
 
     private:
+        void mousePressEvent(QMouseEvent* event) override;
+
         void refreshStyle();
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h

@@ -30,6 +30,8 @@ namespace O3DE::ProjectManager
         void ReinitForProject(const QString& projectPath, bool isNewProject);
         bool EnableDisableGemsForProject(const QString& projectPath);
 
+        GemModel* GetGemModel() const { return m_gemModel; }
+
     private:
         void FillModel(const QString& projectPath, bool isNewProject);
 

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp

@@ -81,8 +81,14 @@ namespace O3DE::ProjectManager
                 {
                     if (button && button->property(k_templateIndexProperty).isValid())
                     {
-                        int projectIndex = button->property(k_templateIndexProperty).toInt();
-                        UpdateTemplateDetails(m_templates.at(projectIndex));
+                        int projectTemplateIndex = button->property(k_templateIndexProperty).toInt();
+                        if (m_selectedTemplateIndex != projectTemplateIndex)
+                        {
+                            const int oldIndex = m_selectedTemplateIndex;
+                            m_selectedTemplateIndex = projectTemplateIndex;
+                            UpdateTemplateDetails(m_templates.at(m_selectedTemplateIndex));
+                            emit OnTemplateSelectionChanged(/*oldIndex=*/oldIndex, /*newIndex=*/m_selectedTemplateIndex);
+                        }
                     }
                 });
 
@@ -115,7 +121,8 @@ namespace O3DE::ProjectManager
                     flowLayout->addWidget(templateButton);
                 }
 
-                m_projectTemplateButtonGroup->buttons().first()->setChecked(true);
+                // Select the first project template (default selection).
+                SelectProjectTemplate(0, /*blockSignals=*/true);
             }
             containerLayout->addWidget(templatesScrollArea);
         }
@@ -159,8 +166,9 @@ namespace O3DE::ProjectManager
 
     QString NewProjectSettingsScreen::GetProjectTemplatePath()
     {
-        const int templateIndex = m_projectTemplateButtonGroup->checkedButton()->property(k_templateIndexProperty).toInt();
-        return m_templates.at(templateIndex).m_path;
+        AZ_Assert(m_selectedTemplateIndex == m_projectTemplateButtonGroup->checkedButton()->property(k_templateIndexProperty).toInt(),
+            "Selected template index not in sync with the currently checked project template button.");
+        return m_templates.at(m_selectedTemplateIndex).m_path;
     }
 
     QFrame* NewProjectSettingsScreen::CreateTemplateDetails(int margin)
@@ -216,4 +224,27 @@ namespace O3DE::ProjectManager
         m_templateSummary->setText(templateInfo.m_summary);
         m_templateIncludedGems->Update(templateInfo.m_includedGems);
     }
+
+    void NewProjectSettingsScreen::SelectProjectTemplate(int index, bool blockSignals)
+    {
+        const QList<QAbstractButton*> buttons = m_projectTemplateButtonGroup->buttons();
+        if (index >= buttons.size())
+        {
+            return;
+        }
+
+        if (blockSignals)
+        {
+            m_projectTemplateButtonGroup->blockSignals(true);
+        }
+
+        QAbstractButton* button = buttons.at(index);
+        button->setChecked(true);
+        m_selectedTemplateIndex = button->property(k_templateIndexProperty).toInt();
+
+        if (blockSignals)
+        {
+            m_projectTemplateButtonGroup->blockSignals(false);
+        }
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h

@@ -22,6 +22,8 @@ namespace O3DE::ProjectManager
     class NewProjectSettingsScreen
         : public ProjectSettingsScreen
     {
+        Q_OBJECT
+
     public:
         explicit NewProjectSettingsScreen(QWidget* parent = nullptr);
         ~NewProjectSettingsScreen() = default;
@@ -31,6 +33,11 @@ namespace O3DE::ProjectManager
 
         void NotifyCurrentScreen() override;
 
+        void SelectProjectTemplate(int index, bool blockSignals = false);
+
+    signals:
+        void OnTemplateSelectionChanged(int oldIndex, int newIndex);
+
     private:
         QString GetDefaultProjectPath();
         QFrame* CreateTemplateDetails(int margin);
@@ -41,6 +48,7 @@ namespace O3DE::ProjectManager
         QLabel* m_templateSummary;
         TagContainerWidget* m_templateIncludedGems;
         QVector<ProjectTemplateInfo> m_templates;
+        int m_selectedTemplateIndex = -1;
 
         inline constexpr static int s_spacerSize = 20;
         inline constexpr static int s_templateDetailsContentMargin = 20;

Code/Tools/ProjectManager/Source/ProjectsScreen.cpp

@@ -92,8 +92,7 @@ namespace O3DE::ProjectManager
 
             QLabel* introLabel = new QLabel(this);
             introLabel->setObjectName("introLabel");
-            introLabel->setText(tr("Welcome to O3DE! Start something new by creating a project. Not sure what to create? \nExplore what's "
-                                   "available by downloading our sample project."));
+            introLabel->setText(tr("Welcome to O3DE! Start something new by creating a project."));
             layout->addWidget(introLabel);
 
             QHBoxLayout* buttonLayout = new QHBoxLayout();