Skip to content

Commit

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

Merged `stabilization/2310` to `main`
  • Loading branch information
@cgalvan
cgalvan authored Oct 9, 2023
2 parents fda4414 + 149bf33 commit ed2f4e8
Show file tree
Hide file tree
Showing 407 changed files with 56,075 additions and 12,872 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ _savebackup/
[Cc]ache/
[Uu]ser/
Sounds/wwise_project/*.wsettings
CMakeUserPresets.json
CMakeUserPresets.json
*.code-workspace
AssetBundling/AssetLists/
AssetBundling/Bundles/
56 changes: 28 additions & 28 deletions AssetBundling/SeedLists/BasePopcornFxSeedList.seed
View file

Large diffs are not rendered by default.

221 changes: 120 additions & 101 deletions AssetBundling/SeedLists/GameSeedList.seed
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,120 @@
<ObjectStream version="3">
<Class name="AZStd::vector&lt;SeedInfo, allocator&gt;" type="{82FC5264-88D0-57CD-9307-FC52E4DAD550}">
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{67155E6B-0365-5033-8A95-C193C1334F5B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3443916038" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="levels/newstarbase/newstarbase.spawnable" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{67155E6B-0365-5033-8A95-C193C1334F5B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="2444860857" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="levels/newstarbase/newstarbase.network.spawnable" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{A216609B-EFB4-54CD-B3C0-4E4907FDA1C9}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="sounds/wwise/init.bnk" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{03A2BEFE-AF6D-5A01-BADA-836DA080FB00}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="sounds/wwise/multiplayersample_soundbank.bnk" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{C17AC204-7D16-52D7-8706-3E737959D3EA}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="libs/gameaudio/wwise/multiplayersample_controls.xml" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{40512DA0-4ED3-55AB-82EC-24EB3FED7296}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="libs/gameaudio/wwise/default_controls.xml" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{4E6C7558-D367-5FD5-95F8-36FAD3DD55BF}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="533909303" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="levels/startmenu/startmenu.spawnable" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{E70688BE-6CC3-58AC-9F0A-BEBD83EA72AA}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="ui/textures/lyshineexamples/panelbkgd.sprite" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{D487D864-03CC-5EA1-BF03-1C922EAA41A8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/scrollbar_vert_track.sprite" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{156D982B-B793-5720-BC57-3B07D40A6E39}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="ui/textures/lyshineexamples/panelbkgd.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{16669CD6-F9D1-5A06-A760-24575C6484F8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="ui/textures/prefab/scrollbar_vert_track.tif.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{AB5B0F22-07A0-5D7D-A9AC-B3225C10552B}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="1000" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="uicanvases/splashscreen/splashscreen.jpg.streamingimage" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
</Class>
</ObjectStream>

{
"Type": "JsonSerialization",
"Version": 1,
"ClassName": "AZStd::vector<SeedInfo, allocator>",
"ClassData": [
{
"assetId": {
"guid": "{67155E6B-0365-5033-8A95-C193C1334F5B}",
"subId": 3443916038
},
"platformFlags": 255,
"pathHint": "levels/newstarbase/newstarbase.spawnable"
},
{
"assetId": {
"guid": "{67155E6B-0365-5033-8A95-C193C1334F5B}",
"subId": 2444860857
},
"platformFlags": 255,
"pathHint": "levels/newstarbase/newstarbase.network.spawnable"
},
{
"assetId": {
"guid": "{A216609B-EFB4-54CD-B3C0-4E4907FDA1C9}"
},
"platformFlags": 255,
"pathHint": "sounds/wwise/init.bnk"
},
{
"assetId": {
"guid": "{03A2BEFE-AF6D-5A01-BADA-836DA080FB00}"
},
"platformFlags": 255,
"pathHint": "sounds/wwise/multiplayersample_soundbank.bnk"
},
{
"assetId": {
"guid": "{C17AC204-7D16-52D7-8706-3E737959D3EA}"
},
"platformFlags": 255,
"pathHint": "libs/gameaudio/wwise/multiplayersample_controls.xml"
},
{
"assetId": {
"guid": "{40512DA0-4ED3-55AB-82EC-24EB3FED7296}"
},
"platformFlags": 255,
"pathHint": "libs/gameaudio/wwise/default_controls.xml"
},
{
"assetId": {
"guid": "{4E6C7558-D367-5FD5-95F8-36FAD3DD55BF}",
"subId": 533909303
},
"platformFlags": 255,
"pathHint": "levels/startmenu/startmenu.spawnable"
},
{
"assetId": {
"guid": "{E70688BE-6CC3-58AC-9F0A-BEBD83EA72AA}"
},
"platformFlags": 255,
"pathHint": "ui/textures/lyshineexamples/panelbkgd.sprite"
},
{
"assetId": {
"guid": "{D487D864-03CC-5EA1-BF03-1C922EAA41A8}"
},
"platformFlags": 255,
"pathHint": "ui/textures/prefab/scrollbar_vert_track.sprite"
},
{
"assetId": {
"guid": "{156D982B-B793-5720-BC57-3B07D40A6E39}",
"subId": 1000
},
"platformFlags": 255,
"pathHint": "ui/textures/lyshineexamples/panelbkgd.tif.streamingimage"
},
{
"assetId": {
"guid": "{16669CD6-F9D1-5A06-A760-24575C6484F8}",
"subId": 1000
},
"platformFlags": 255,
"pathHint": "ui/textures/prefab/scrollbar_vert_track.tif.streamingimage"
},
{
"assetId": {
"guid": "{AB5B0F22-07A0-5D7D-A9AC-B3225C10552B}",
"subId": 1000
},
"platformFlags": 255,
"pathHint": "uicanvases/splashscreen/splashscreen.jpg.streamingimage"
},
{
"assetId": {
"guid": "{775F7670-09BB-5568-8F8C-4122F68EEE30}",
"subId": 595876996
},
"platformFlags": 255,
"pathHint": "mpsgamelift/prefabs/gameliftconnectjsonmenu.spawnable"
},
{
"assetId": {
"guid": "{DD84481F-C18D-5EDF-A8EC-3EB87A97CEA6}"
},
"platformFlags": 1,
"pathHint": "config/default_aws_resource_mappings.json"
},
{
"assetId": {
"guid": "{424E3241-9748-537B-8742-B3A8D986E61D}",
"subId": 1157861216
},
"platformFlags": 1,
"pathHint": "mpsgamelift/prefabs/gameliftflexmatchconnect.spawnable"
}
]
}
13 changes: 0 additions & 13 deletions AssetBundling/SeedLists/ProfileOnlySeedList.seed
View file

This file was deleted.

2 changes: 1 addition & 1 deletion AssetBundling/SeedLists/VFXSeedList.seed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Class name="AZ::Uuid" field="guid" value="{B1AB7BB1-87C1-567C-9E6B-411C1192237E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
<Class name="unsigned int" field="platformFlags" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::string" field="pathHint" value="popcornfx_pack.json" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
</Class>
Expand Down
3 changes: 0 additions & 3 deletions BURT/BURT.motionset
View file

This file was deleted.

3 changes: 0 additions & 3 deletions BURT/BURTActor.fbx
View file

This file was deleted.

Loading

0 comments on commit ed2f4e8

Please sign in to comment.