Merge pull request #141 from aws-lumberyard-dev/allisaurus/gitflow_230327_o3dempsassets

Merge stabilization/2305 to development on 3/27/2023

Gems/character_mps/Assets/Mixamo/Ybot/YBot.animgraph

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a41e739eb54c462f62a5045a7e688252e07023bf30564179d88356451519df07
-size 820826
+oid sha256:995971c14f95bba3ad1d7cc12a9eed5384d1c4d052a941a8974c6e966f1f92c3
+size 821548

Gems/character_mps/Assets/Mixamo/Ybot/ybot.fbx.assetinfo

@@ -163,13 +163,13 @@
                                                         "Position": [
                                                             -1.0459189070388675e-11,
                                                             2.7939677238464355e-9,
-                                                            -0.14270569384098053
+                                                            -0.012705703265964985
                                                         ],
                                                         "Rotation": [
-                                                            -2.075933025480481e-8,
-                                                            -7.771233656583831e-11,
+                                                            -0.05233597755432129,
                                                             0.0,
-                                                            1.0
+                                                            0.0,
+                                                            0.9986295104026794
                                                         ],
                                                         "MaterialSlots": {
                                                             "Slots": [
@@ -181,7 +181,7 @@
                                                     },
                                                     {
                                                         "$type": "CapsuleShapeConfiguration",
-                                                        "Height": 1.0245884656906128,
+                                                        "Height": 0.8745884895324707,
                                                         "Radius": 0.20715969800949097
                                                     }
                                                 ]
@@ -216,6 +216,456 @@
                                                     }
                                                 ]
                                             ]
+                                        },
+                                        {
+                                            "name": "mixamorig:LeftArm",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            8.380538929486647e-9,
+                                                            2.9802322387695313e-8,
+                                                            0.1370234340429306
+                                                        ],
+                                                        "Rotation": [
+                                                            -1.0874899913915215e-7,
+                                                            3.0580679322156357e-8,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.3340468108654022,
+                                                        "Radius": 0.08211670070886612
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:LeftForeArm",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            7.077824193402193e-8,
+                                                            -7.450580596923828e-9,
+                                                            0.13807237148284912
+                                                        ],
+                                                        "Rotation": [
+                                                            2.698070744600045e-8,
+                                                            2.5630848199398315e-7,
+                                                            -0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.2861447036266327,
+                                                        "Radius": 0.07155109941959381
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:RightArm",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            -4.263256414560601e-14,
+                                                            0.0,
+                                                            0.1370234340429306
+                                                        ],
+                                                        "Rotation": [
+                                                            0.0,
+                                                            -1.5556669450897398e-13,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.3340468108654022,
+                                                        "Radius": 0.08211670070886612
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:RightForeArm",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            -4.8428827170710065e-8,
+                                                            1.862645149230957e-7,
+                                                            0.13807232677936554
+                                                        ],
+                                                        "Rotation": [
+                                                            -6.745179348399688e-7,
+                                                            -1.7537485064167413e-7,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.2761446237564087,
+                                                        "Radius": 0.0613320991396904
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:RightHand",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            0.001117434585466981,
+                                                            0.002615051344037056,
+                                                            0.11188609898090363
+                                                        ],
+                                                        "Rotation": [
+                                                            -0.02516588196158409,
+                                                            0.01947888545691967,
+                                                            -0.00021971133537590504,
+                                                            0.999493420124054
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "BoxShapeConfiguration",
+                                                        "Configuration": [
+                                                            0.06440538913011551,
+                                                            0.06440538913011551,
+                                                            0.19392800331115723
+                                                        ]
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:LeftHand",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            -0.001117422361858189,
+                                                            0.0026150066405534744,
+                                                            0.10188619792461395
+                                                        ],
+                                                        "Rotation": [
+                                                            -0.02517111413180828,
+                                                            -0.010755905881524086,
+                                                            0.0,
+                                                            0.9996253252029419
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "BoxShapeConfiguration",
+                                                        "Configuration": [
+                                                            0.06723768264055252,
+                                                            0.06723768264055252,
+                                                            0.19392800331115723
+                                                        ]
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:LeftUpLeg",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            3.6088749766349792e-9,
+                                                            2.0017765223201422e-10,
+                                                            0.20299722254276276
+                                                        ],
+                                                        "Rotation": [
+                                                            -4.930551522619453e-10,
+                                                            8.888976665843984e-9,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.43599438667297363,
+                                                        "Radius": 0.09858100116252899
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:LeftLeg",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            5.9371814131736755e-9,
+                                                            5.239542133494979e-11,
+                                                            0.21049518883228302
+                                                        ],
+                                                        "Rotation": [
+                                                            -1.244575276171389e-10,
+                                                            1.4102891299216935e-8,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.4509904086589813,
+                                                        "Radius": 0.0792573019862175
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:RightLeg",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            -1.1641532182693481e-10,
+                                                            -2.8097417725803098e-9,
+                                                            0.21049515902996063
+                                                        ],
+                                                        "Rotation": [
+                                                            6.674124364280942e-9,
+                                                            -2.765273010574276e-10,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.4509902894496918,
+                                                        "Radius": 0.07926329970359802
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:RightUpLeg",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            8.847564458847046e-9,
+                                                            1.7278978248214116e-9,
+                                                            0.20299720764160156
+                                                        ],
+                                                        "Rotation": [
+                                                            -4.255964469734863e-9,
+                                                            2.1792329718550718e-8,
+                                                            0.0,
+                                                            1.0
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.43599438667297363,
+                                                        "Radius": 0.09855199605226517
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:LeftFoot",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            0.0,
+                                                            0.0,
+                                                            0.07860779762268066
+                                                        ],
+                                                        "Rotation": [
+                                                            -0.08715570718050003,
+                                                            8.851972488344018e-9,
+                                                            -7.744471730575242e-10,
+                                                            0.9961947202682495
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.3072156012058258,
+                                                        "Radius": 0.058590300381183624
+                                                    }
+                                                ]
+                                            ]
+                                        },
+                                        {
+                                            "name": "mixamorig:RightFoot",
+                                            "shapes": [
+                                                [
+                                                    {
+                                                        "CollisionLayer": {
+                                                            "Index": 1
+                                                        },
+                                                        "Visible": true,
+                                                        "Simulated": false,
+                                                        "Position": [
+                                                            -5.122274160385132e-9,
+                                                            1.2500095181167126e-8,
+                                                            0.07860777527093887
+                                                        ],
+                                                        "Rotation": [
+                                                            -0.08715569972991943,
+                                                            -3.2457240450867175e-8,
+                                                            2.8396363038751815e-9,
+                                                            0.9961947202682495
+                                                        ],
+                                                        "MaterialSlots": {
+                                                            "Slots": [
+                                                                {
+                                                                    "Name": "Entire object"
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    {
+                                                        "$type": "CapsuleShapeConfiguration",
+                                                        "Height": 0.3072156012058258,
+                                                        "Radius": 0.058590300381183624
+                                                    }
+                                                ]
+                                            ]
                                         }
                                     ]
                                 }

Gems/level_art_mps/Assets/MalfunctioningShieldGenerator/mshieldgen.prefab

@@ -71,7 +71,8 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 12100052168573794820,
                     "Child Entity Order": [
-                        "Entity_[38393244868340]"
+                        "Entity_[38393244868340]",
+                        "Entity_[9833571067542]"
                     ]
                 },
                 "Component_[13851468120070323071]": {
@@ -194,7 +195,7 @@
         },
         "Entity_[38393244868340]": {
             "Id": "Entity_[38393244868340]",
-            "Name": "pkemitter",
+            "Name": "IdleEffects",
             "Components": {
                 "Component_[1224808521090880768]": {
                     "$type": "EditorInspectorComponent",
@@ -229,7 +230,116 @@
                             "source": {
                                 "id": "{3D5FC3EE-2EA9-5827-B70A-0FF93D95BE8A}",
                                 "path": "scriptcanvas/ShieldGeneratorRoundEffects.scriptcanvas"
-                            }
+                            },
+                            "variables": [
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 3
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "double",
+                                        "value": 0.0
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{251012C9-C4D6-4FB3-AA03-EB593EE1BFEC}"
+                                    },
+                                    "VariableName": "ExplodeTimesDuringMatch",
+                                    "InitialValueSource": 1
+                                },
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 3
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "double",
+                                        "value": 0.0
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{8B894CB8-6339-46EC-B608-5D936C76070C}"
+                                    },
+                                    "VariableName": "DamageMagnitude",
+                                    "InitialValueSource": 1
+                                },
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 3
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "double",
+                                        "value": 0.0
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{95843EC3-D528-453B-940D-9E78061CCE0F}"
+                                    },
+                                    "VariableName": "DamageDistance",
+                                    "InitialValueSource": 1
+                                }
+                            ],
+                            "overrides": [
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 3
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "double",
+                                        "value": 8.0
+                                    },
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{251012C9-C4D6-4FB3-AA03-EB593EE1BFEC}"
+                                    },
+                                    "VariableName": "ExplodeTimesDuringMatch",
+                                    "InitialValueSource": 1
+                                },
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 3
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "double",
+                                        "value": 80.0
+                                    },
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{8B894CB8-6339-46EC-B608-5D936C76070C}"
+                                    },
+                                    "VariableName": "DamageMagnitude",
+                                    "InitialValueSource": 1
+                                },
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 3
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "double",
+                                        "value": 12.0
+                                    },
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{95843EC3-D528-453B-940D-9E78061CCE0F}"
+                                    },
+                                    "VariableName": "DamageDistance",
+                                    "InitialValueSource": 1
+                                }
+                            ]
                         }
                     }
                 },
@@ -311,6 +421,111 @@
                     }
                 }
             }
+        },
+        "Entity_[9833571067542]": {
+            "Id": "Entity_[9833571067542]",
+            "Name": "ExplosionEffects",
+            "Components": {
+                "Component_[11361052352830498103]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 11361052352830498103
+                },
+                "Component_[113784268885259117]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 113784268885259117,
+                    "m_template": {
+                        "$type": "AudioProxyComponent"
+                    }
+                },
+                "Component_[12744967703110273188]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 12744967703110273188
+                },
+                "Component_[13341644611575863749]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13341644611575863749
+                },
+                "Component_[1428767951105775892]": {
+                    "$type": "EditorScriptCanvasComponent",
+                    "Id": 1428767951105775892,
+                    "configuration": {
+                        "sourceHandle": {
+                            "id": "{9767C953-7B55-5DD8-BFDA-14CB8E7C2D51}",
+                            "path": "scriptcanvas/ShieldGeneratorExplosionEffects.scriptcanvas"
+                        },
+                        "sourceName": "ShieldGeneratorExplosionEffects.scriptcanvas",
+                        "propertyOverrides": {
+                            "source": {
+                                "id": "{9767C953-7B55-5DD8-BFDA-14CB8E7C2D51}",
+                                "path": "scriptcanvas/ShieldGeneratorExplosionEffects.scriptcanvas"
+                            }
+                        }
+                    }
+                },
+                "Component_[16113105889926656189]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 16113105889926656189
+                },
+                "Component_[1612633179355894235]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 1612633179355894235
+                },
+                "Component_[17631951853474351720]": {
+                    "$type": "PopcornFXEmitterEditorComponent",
+                    "Id": 17631951853474351720,
+                    "ParticleSystem": {
+                        "assetId": {
+                            "guid": "{6D7AE0BE-B867-516A-8ECB-ECD5E8F14366}"
+                        },
+                        "assetHint": "popcornfx/particles/malfunctionningshieldgenerator/fx_malfunctionningshieldgenerator_explosion.pkfx"
+                    },
+                    "PrewarmTime": 0.0,
+                    "AttributeList": {
+                        "Attributes": [
+                            {
+                                "Name": "Global Scale",
+                                "Type": 31
+                            },
+                            {
+                                "Name": "Color Intensity",
+                                "Type": 31
+                            }
+                        ],
+                        "AttributesRawData": "AACAQAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAA="
+                    }
+                },
+                "Component_[17760274181297249561]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 17760274181297249561
+                },
+                "Component_[4748490630263463331]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4748490630263463331,
+                    "Parent Entity": "Entity_[1103265106721603]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            2.320342540740967
+                        ]
+                    }
+                },
+                "Component_[51257802137193943]": {
+                    "$type": "EditorAudioTriggerComponent",
+                    "Id": 51257802137193943,
+                    "Play Trigger": {
+                        "controlName": "play_sx_int_malfunctioningshieldgenerator_explo"
+                    }
+                },
+                "Component_[5383958341537098534]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 5383958341537098534
+                },
+                "Component_[8817677768491782671]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 8817677768491782671
+                }
+            }
         }
     }
 }