Skip to content

Commit

Permalink
Merge pull request #160 from o3de/cgalvan/gitflow_230503_o3de-multipl…
Browse files Browse the repository at this point in the history 
…ayersample-assets

Merged `stabilization/2305` into `main`
  • Loading branch information
@AMZN-alexpete
AMZN-alexpete authored May 3, 2023
2 parents 04d7f20 + 8d1a8ac commit d385172
Show file tree
Hide file tree
Showing 37 changed files with 2,139 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Gems/O3DEPopcornFXPlugin
Submodule O3DEPopcornFXPlugin updated 11 files
+2 −2 Assets/shaders/Ribbon/Legacy/RibbonLit_Legacy.azsl
+2 −2 Assets/shaders/Ribbon/Legacy/Ribbon_Legacy.azsl
+1 −1 Code/CMakeLists.txt
+2 −2 Code/Platform/Linux/PAL_linux.cmake
+2 −2 Code/Platform/Mac/PAL_mac.cmake
+2 −2 Code/Platform/Windows/PAL_windows.cmake
+5 −5 Code/Source/Integration/Preloader/PopcornFXRendererLoader.cpp
+1 −1 Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.h
+2 −1 Code/Source/PopcornFXModule.cpp
+1 −1 README.md
+4 −4 gem.json
4 changes: 2 additions & 2 deletions Gems/character_mps/Assets/Attachments/Laser_Gun/gun.fbx
View file
Git LFS file not shown
4 changes: 2 additions & 2 deletions Gems/character_mps/Assets/Mixamo/Ybot/YBot.animgraph
View file
Git LFS file not shown
460 changes: 455 additions & 5 deletions Gems/character_mps/Assets/Mixamo/Ybot/ybot.fbx.assetinfo
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/HTS_Lift_A/HTS_Lift_A_Main.fbx
View file
Git LFS file not shown
3 changes: 3 additions & 0 deletions Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/HTS_Lift_A/Maya2023_HTS_Lift_A_Main.mb
View file
Git LFS file not shown
18 changes: 18 additions & 0 deletions Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Prefabs/HTS_BldgMD_G.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,13 @@
"$type": "EditorLockComponent",
"Id": 276023020415925966
},
"Component_[324479580313661198]": {
"$type": "GenericComponentWrapper",
"Id": 324479580313661198,
"m_template": {
"$type": "AudioProxyComponent"
}
},
"Component_[5564789716330677387]": {
"$type": "EditorVisibilityComponent",
"Id": 5564789716330677387
Expand Down Expand Up @@ -540,6 +547,17 @@
"Component_[97446744851507173]": {
"$type": "EditorPendingCompositionComponent",
"Id": 97446744851507173
},
"Component_[9957966670136288551]": {
"$type": "EditorAudioTriggerComponent",
"Id": 9957966670136288551,
"Play Trigger": {
"controlName": "play_sx_env_lamp_loop"
},
"Stop Trigger": {
"controlName": "stop_sx_env_lamp_loop"
},
"Plays Immediately": true
}
}
},
Expand Down
21 changes: 20 additions & 1 deletion Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Prefabs/HTS_Lamp.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,24 @@
"$type": "EditorEntityIconComponent",
"Id": 4894639065274315892
},
"Component_[642417647231732146]": {
"$type": "GenericComponentWrapper",
"Id": 642417647231732146,
"m_template": {
"$type": "AudioProxyComponent"
}
},
"Component_[8125702530470979581]": {
"$type": "EditorAudioTriggerComponent",
"Id": 8125702530470979581,
"Play Trigger": {
"controlName": "play_sx_env_lamp_loop"
},
"Stop Trigger": {
"controlName": "stop_sx_env_lamp_loop"
},
"Plays Immediately": true
},
"Component_[841319223343298906]": {
"$type": "EditorInspectorComponent",
"Id": 841319223343298906,
Expand Down Expand Up @@ -305,7 +323,8 @@
"Intensity": 250.0,
"AttenuationRadiusMode": 0,
"AttenuationRadius": 6.0,
"UseFastApproximation": true
"UseFastApproximation": true,
"Affects GI": false
}
}
},
Expand Down
5 changes: 4 additions & 1 deletion Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Prefabs/HTS_Road_G.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1754,6 +1754,9 @@
}
}
}
},
"DebugDrawSettings": {
"LocallyEnabled": false
}
},
"Component_[17340959477533051509]": {
Expand Down Expand Up @@ -2215,7 +2218,7 @@
{
"op": "replace",
"path": "/ContainerEntity/Components/Component_[11882972241381921570]/Transform Data/Translate/0",
"value": -15.723724365234375
"value": -15.723724365234377
},
{
"op": "replace",
Expand Down
4 changes: 2 additions & 2 deletions Gems/level_art_mps/Assets/Crate/Crate.fbx
View file
Git LFS file not shown
4 changes: 2 additions & 2 deletions Gems/level_art_mps/Assets/Crate/Maya2023_Crate.mb
View file
Git LFS file not shown
232 changes: 231 additions & 1 deletion Gems/level_art_mps/Assets/JumpPad/jumppad.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,24 @@
},
"Component_[12283440537049891922]": {
"$type": "EditorEntitySortComponent",
"Id": 12283440537049891922
"Id": 12283440537049891922,
"Child Entity Order": [
"Entity_[20239823635620]"
]
},
"Component_[12818888677478174901]": {
"$type": "EditorAudioTriggerComponent",
"Id": 12818888677478174901,
"Play Trigger": {
"controlName": "play_sx_int_jumppad_launch"
}
},
"Component_[13047132521723915878]": {
"$type": "GenericComponentWrapper",
"Id": 13047132521723915878,
"m_template": {
"$type": "AudioProxyComponent"
}
},
"Component_[1342242030955226421]": {
"$type": "EditorVisibilityComponent",
Expand All @@ -89,6 +106,9 @@
"$type": "EditorMeshColliderComponent",
"Id": 14766259045021778464,
"ColliderConfiguration": {
"CollisionLayer": {
"Index": 2
},
"MaterialSlots": {
"Slots": [
{
Expand Down Expand Up @@ -130,6 +150,70 @@
"$type": "EditorStaticRigidBodyComponent",
"Id": 1735639133782999286
},
"Component_[39629120857318069]": {
"$type": "EditorScriptCanvasComponent",
"Id": 39629120857318069,
"configuration": {
"sourceHandle": {
"id": "{DCBC58DF-6DB8-5E71-B35B-769F46FA5B10}",
"path": "scriptcanvas/JumpPad.scriptcanvas"
},
"sourceName": "JumpPad.scriptcanvas",
"propertyOverrides": {
"source": {
"id": "{DCBC58DF-6DB8-5E71-B35B-769F46FA5B10}",
"path": "scriptcanvas/JumpPad.scriptcanvas"
},
"variables": [
{
"Datum": {
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 8
},
"isNullPointer": false,
"$type": "Vector3",
"value": [
0.0,
0.0,
0.0
]
},
"VariableId": {
"m_id": "{A3DAF982-0699-49BA-8E12-A20851DEDF38}"
},
"VariableName": "Impulse",
"InitialValueSource": 1
}
],
"overrides": [
{
"Datum": {
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 8
},
"isNullPointer": false,
"$type": "Vector3",
"value": [
0.0,
0.0,
25.0
]
},
"InputControlVisibility": {
"Value": 850104567
},
"VariableId": {
"m_id": "{A3DAF982-0699-49BA-8E12-A20851DEDF38}"
},
"VariableName": "Impulse",
"InitialValueSource": 1
}
]
}
}
},
"Component_[4457373516699865523]": {
"$type": "EditorInspectorComponent",
"Id": 4457373516699865523,
Expand Down Expand Up @@ -188,6 +272,152 @@
"Id": 9239518287260626782
}
}
},
"Entity_[20239823635620]": {
"Id": "Entity_[20239823635620]",
"Name": "jumppadFx",
"Components": {
"Component_[10039726488493153784]": {
"$type": "EditorEntitySortComponent",
"Id": 10039726488493153784
},
"Component_[10918246284294112742]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 10918246284294112742,
"Parent Entity": "Entity_[1104171344821059]",
"Transform Data": {
"Translate": [
0.0,
0.0,
0.12310004234313965
],
"Rotate": [
180.0,
0.0,
180.0
]
}
},
"Component_[1541676746712690353]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 1541676746712690353
},
"Component_[1613717797376241316]": {
"$type": "EditorOnlyEntityComponent",
"Id": 1613717797376241316
},
"Component_[16570740466809034129]": {
"$type": "PopcornFXEmitterEditorComponent",
"Id": 16570740466809034129,
"ParticleSystem": {
"assetId": {
"guid": "{3FD29CAB-9815-5751-BFE2-31C5795D03EC}"
},
"assetHint": "popcornfx/particles/fx_jumppad.pkfx"
},
"PrewarmTime": 0.0,
"AttributeList": {
"Attributes": [
{
"Name": "GlobalScale",
"Type": 31
},
{
"Name": "Color",
"Type": 34
},
{
"Name": "Launch",
"Type": 1
},
{
"Name": "Range",
"Type": 31
},
{
"Name": "Brightness",
"Type": 31
},
{
"Name": "Bursts",
"Type": 31
},
{
"Name": "DistortionPower",
"Type": 31
}
],
"AttributesRawData": "mpmZPwAAAAAAAAAAAAAAAAAAAAAAAIA/GFRAPgAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAoEAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=="
},
"EditorAttributeList": {
"AttributeCategories": [
{
"Attributes": [
{
"ValueFX": 1.0
},
{
"ValueFX": 2.0
}
]
},
{
"Attributes": [
{
"Color": [
0.0,
1.0,
0.18782079219818115
]
},
{
"ValueFX": 5.0
}
]
},
{
"Attributes": [
{
"ValueFX": 1.0
}
]
},
{
"Attributes": [
{}
]
},
{
"Attributes": [
{
"ValueFX": 1.2000000476837158
}
]
}
]
}
},
"Component_[18363391600917116732]": {
"$type": "EditorEntityIconComponent",
"Id": 18363391600917116732
},
"Component_[2236560654144302887]": {
"$type": "EditorInspectorComponent",
"Id": 2236560654144302887
},
"Component_[5961259476451355829]": {
"$type": "EditorPendingCompositionComponent",
"Id": 5961259476451355829
},
"Component_[6955340436542433750]": {
"$type": "EditorLockComponent",
"Id": 6955340436542433750
},
"Component_[9227924109322544032]": {
"$type": "EditorVisibilityComponent",
"Id": 9227924109322544032
}
}
}
}
}
Loading

0 comments on commit d385172

Please sign in to comment.