Merge pull request #202 from o3de/stabilization/2210

Merge stabilization/2210 into main Signed-off-by: Alex Peterson <[email protected]>
o3de · Oct 11, 2022 · ec2291c · ec2291c
2 parents 50a9aed + 1c0c328
commit ec2291c
Show file tree

Hide file tree

Showing 39 changed files with 1,728 additions and 490 deletions.
diff --git a/Assets/Physics/SurfaceTypeMaterialLibrary.physmaterial b/Assets/Physics/SurfaceTypeMaterialLibrary.physmaterial
diff --git a/Gem/Code/CMakeLists.txt b/Gem/Code/CMakeLists.txt
@@ -29,12 +29,14 @@ ly_add_target(
             Gem::PhysX
             Gem::StartingPointInput
             Gem::DebugDraw
+            Gem::LyShine
         PRIVATE
             Gem::LmbrCentral.Static
             Gem::Multiplayer.Static
             Gem::PhysX.Static
             Gem::DebugDraw.Static
             Gem::ImGui.Static
+            Gem::LyShine.Static
     AUTOGEN_RULES
         *.AutoComponent.xml,AutoComponent_Header.jinja,$path/$fileprefix.AutoComponent.h
         *.AutoComponent.xml,AutoComponent_Source.jinja,$path/$fileprefix.AutoComponent.cpp
@@ -78,5 +80,5 @@ if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
     set_property(GLOBAL APPEND PROPERTY LY_LAUNCHER_SERVER_PROJECTS MultiplayerSample)
 endif()
 
-set_property(TARGET MultiplayerSample APPEND PROPERTY GAMELAUNCHER_ADDITIONAL_VS_DEBUGGER_COMMAND_ARGUMENTS "--console-command-file=\"client.cfg\"")
-set_property(TARGET MultiplayerSample APPEND PROPERTY SERVERLAUNCHER_ADDITIONAL_VS_DEBUGGER_COMMAND_ARGUMENTS "--console-command-file=\"server.cfg\"")
+set_property(TARGET MultiplayerSample APPEND PROPERTY GAMELAUNCHER_ADDITIONAL_VS_DEBUGGER_COMMAND_ARGUMENTS "--console-command-file=\"launch_client.cfg\"")
+set_property(TARGET MultiplayerSample APPEND PROPERTY SERVERLAUNCHER_ADDITIONAL_VS_DEBUGGER_COMMAND_ARGUMENTS "--console-command-file=\"launch_server.cfg\"")
diff --git a/Gem/Code/Source/AutoGen/NetworkRandomTranslateComponent.AutoComponent.xml b/Gem/Code/Source/AutoGen/NetworkRandomTranslateComponent.AutoComponent.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<Component
+	Name="NetworkRandomTranslateComponent"
+	Namespace="MultiplayerSample"
+	OverrideComponent="false"
+	OverrideController="true"
+	OverrideInclude="Source/Components/PerfTest/NetworkRandomTranslateComponent.h"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <ComponentRelation Constraint="Required" HasController="false" Name="NetworkTransformComponent" Namespace="Multiplayer" Include="Multiplayer/Components/NetworkTransformComponent.h" />
+
+	<ArchetypeProperty Type="float" Name="MovementDuration" Init="2.f" ExposeToEditor="true" Description="The number of seconds it takes to make a move."/>
+	<ArchetypeProperty Type="float" Name="MaxMoveDistance" Init="10.f" ExposeToEditor="true" Description="The max distance to move in a period."/>
+
+</Component>
diff --git a/Gem/Code/Source/AutoGen/NetworkStressTestComponent.AutoComponent.xml b/Gem/Code/Source/AutoGen/NetworkStressTestComponent.AutoComponent.xml
@@ -8,7 +8,7 @@
     OverrideInclude="Source/Components/NetworkStressTestComponent.h"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <ArchetypeProperty Type="AZ::TimeMs" Name="AutoSpawnIntervalMs" Init="0" ExposeToEditor="true" Description="If > 0, will autospawn an AI using the provided interval" />
+    <ArchetypeProperty Type="AZ::TimeMs" Name="AutoSpawnIntervalMs" Init="AZ::Time::ZeroTimeMs" ExposeToEditor="true" Description="If > 0, will autospawn an AI using the provided interval" />
     <ArchetypeProperty Type="uint32_t" Name="MaxSpawns" Init="0" ExposeToEditor="true" Description="If > 0, will cap the total number of spawned AI to the provided value" />
 
     <NetworkProperty Type="bool" Name="Enabled" Init="true" ReplicateFrom="Authority" ReplicateTo="Client" Container="Object" IsPublic="true" IsRewindable="false" IsPredictable="false" ExposeToEditor="true" ExposeToScript="false" GenerateEventBindings="false" Description="If enabled, this AI component overrides movement and camera components." />