Quellcode durchsuchen

pull merge upstream stab and resolve

Signed-off-by: HogJonny-AMZN <[email protected]>
HogJonny-AMZN vor 2 Jahren
Ursprung
Commit
c35f3bcc44
48 geänderte Dateien mit 355 neuen und 859 gelöschten Zeilen
  1. 1 1
      DiffuseProbeGrids/GI_A_high_462B91C3-438F-4658-B5DD-36644D93CF3F_Distance_lutrg32f.dds
  2. 1 1
      DiffuseProbeGrids/GI_A_high_78B15A3B-DF48-4FDB-82F4-D05086A1F65A_Irradiance_lutrgba16f.dds
  3. 1 1
      DiffuseProbeGrids/GI_A_high_9F083681-3E21-4FA6-AAC0-9A7C41C2ABE0_ProbeData_lutrgba16f.dds
  4. 3 0
      DiffuseProbeGrids/GI_A_high_B_2423AC46-0FE4-41D5-8C5D-A3EEA4062700_Distance_lutrg32f.dds
  5. 3 0
      DiffuseProbeGrids/GI_A_high_B_B58A0B5E-1204-4AB7-95FF-1AC9AC1E122C_Irradiance_lutrgba16f.dds
  6. 3 0
      DiffuseProbeGrids/GI_A_high_B_F53F77F6-C39D-4A85-BB6D-0B177CF2F47A_ProbeData_lutrgba16f.dds
  7. 1 1
      DiffuseProbeGrids/GI_A_low_0FBFAB97-FA4D-40B6-AD8D-A05099CB0C6F_ProbeData_lutrgba16f.dds
  8. 1 1
      DiffuseProbeGrids/GI_A_low_13791D93-5F03-4306-B535-B9894721E51F_Distance_lutrg32f.dds
  9. 1 1
      DiffuseProbeGrids/GI_A_low_F898EDBB-A70A-4E76-9284-2A794C87D8C0_Irradiance_lutrgba16f.dds
  10. 1 1
      DiffuseProbeGrids/GI_A_mid_0865C4A5-470C-49A1-8ADD-AA2B47BE7944_ProbeData_lutrgba16f.dds
  11. 1 1
      DiffuseProbeGrids/GI_A_mid_8C589AF0-EE5E-4F8A-92C6-D067E669CA76_Irradiance_lutrgba16f.dds
  12. 1 1
      DiffuseProbeGrids/GI_A_mid_CE79F73D-5EAC-43C5-B7AF-E4DCB5832BDC_Distance_lutrg32f.dds
  13. 1 1
      DiffuseProbeGrids/GI_B_high_3E104E70-CC21-488A-8B4E-243EB1F49BA2_Distance_lutrg32f.dds
  14. 1 1
      DiffuseProbeGrids/GI_B_high_9E1F7FE9-9D17-4C22-84E8-CCBB8C81BCA9_ProbeData_lutrgba16f.dds
  15. 1 1
      DiffuseProbeGrids/GI_B_high_E3BA7825-8B51-4866-BE88-E18CABA7D90C_Irradiance_lutrgba16f.dds
  16. 2 2
      DiffuseProbeGrids/GI_B_low_1DD289CF-F9E2-4A4D-A91B-E47597614FC8_Irradiance_lutrgba16f.dds
  17. 2 2
      DiffuseProbeGrids/GI_B_low_B87A2E7A-37CE-4B5C-B46A-04C531877D60_ProbeData_lutrgba16f.dds
  18. 2 2
      DiffuseProbeGrids/GI_B_low_D654C7C3-B995-4F58-A3C9-E302480EB292_Distance_lutrg32f.dds
  19. 2 2
      DiffuseProbeGrids/GI_B_mid_left_A6A7C43E-FB32-4083-A3F2-30C6A4F5B295_Distance_lutrg32f.dds
  20. 2 2
      DiffuseProbeGrids/GI_B_mid_left_BB26F8C4-1CB2-4628-85BA-146A25417305_ProbeData_lutrgba16f.dds
  21. 2 2
      DiffuseProbeGrids/GI_B_mid_left_E4D6FBEE-A850-485A-BEE8-B5A959FE9829_Irradiance_lutrgba16f.dds
  22. 1 1
      DiffuseProbeGrids/GI_B_mid_right_00EC102E-FB1F-4A05-877E-35E693B7D164_Distance_lutrg32f.dds
  23. 1 1
      DiffuseProbeGrids/GI_B_mid_right_158C953A-4481-4A9A-84E0-35D36BE30D32_Irradiance_lutrgba16f.dds
  24. 1 1
      DiffuseProbeGrids/GI_B_mid_right_82767D3D-3483-4D35-A68D-25F41D3A2FC1_ProbeData_lutrgba16f.dds
  25. 1 1
      DiffuseProbeGrids/GI_walkway_A_025EAFCD-CA3A-46B0-B81E-35CE319648AF_Irradiance_lutrgba16f.dds
  26. 1 1
      DiffuseProbeGrids/GI_walkway_A_0FC57689-9F9F-41BF-BCF7-94A2C89790C9_Distance_lutrg32f.dds
  27. 1 1
      DiffuseProbeGrids/GI_walkway_A_14925238-B4A4-4663-AC3E-CD485EE42F3E_Distance_lutrg32f.dds
  28. 1 1
      DiffuseProbeGrids/GI_walkway_A_197048E9-A4AF-4F1D-9251-AD0DFF40FC1F_Distance_lutrg32f.dds
  29. 1 1
      DiffuseProbeGrids/GI_walkway_A_1E915665-8730-40D1-890B-463E40E87B7B_ProbeData_lutrgba16f.dds
  30. 1 1
      DiffuseProbeGrids/GI_walkway_A_27BB77E5-B187-4A2E-A6C2-1940207B98EE_Distance_lutrg32f.dds
  31. 2 2
      DiffuseProbeGrids/GI_walkway_A_2A3F3FFE-4D9A-4890-AAF0-EA195B2FB2BF_Irradiance_lutrgba16f.dds
  32. 1 1
      DiffuseProbeGrids/GI_walkway_A_3D0720A0-670C-46CD-94A7-51E416A84EA1_ProbeData_lutrgba16f.dds
  33. 2 2
      DiffuseProbeGrids/GI_walkway_A_532CA209-C8A2-4FCE-B8D3-B897AFD4164F_ProbeData_lutrgba16f.dds
  34. 1 1
      DiffuseProbeGrids/GI_walkway_A_7DE7840B-B8A1-4B3E-9FCD-501117B14C6A_Distance_lutrg32f.dds
  35. 1 1
      DiffuseProbeGrids/GI_walkway_A_81E8CC72-2668-4B69-9924-0A411E6D138B_ProbeData_lutrgba16f.dds
  36. 1 1
      DiffuseProbeGrids/GI_walkway_A_95DA033B-EA98-4236-8EA8-D345497B55F8_Irradiance_lutrgba16f.dds
  37. 1 1
      DiffuseProbeGrids/GI_walkway_A_98E8A41D-5120-449F-A204-B11DD9B95437_Irradiance_lutrgba16f.dds
  38. 2 2
      DiffuseProbeGrids/GI_walkway_A_C2CB71C5-9465-4103-955D-014D46320D54_Distance_lutrg32f.dds
  39. 1 1
      DiffuseProbeGrids/GI_walkway_A_CB834C0A-23B2-45A5-AB28-6970B293768B_ProbeData_lutrgba16f.dds
  40. 1 1
      DiffuseProbeGrids/GI_walkway_A_CE74DEBF-FE95-41C8-9D82-DEC100FDEFA5_Irradiance_lutrgba16f.dds
  41. 1 1
      DiffuseProbeGrids/GI_walkway_A_F1B111FD-4FB0-46FF-943B-6FF09416B938_Irradiance_lutrgba16f.dds
  42. 2 0
      Gem/Code/Include/DecalBus.h
  43. 1 1
      Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.cpp
  44. 1 1
      Gem/Code/Source/Components/NetworkMatchComponent.cpp
  45. 27 564
      Levels/GameplayTest/GameplayTest.prefab
  46. 264 245
      Levels/NewStarbase/NewStarbase.prefab
  47. 3 0
      Prefabs/Energy_Cannon_with_Energy_Ball.prefab
  48. 1 1
      Prefabs/GamePlay_Effects.prefab

+ 1 - 1
DiffuseProbeGrids/GI_A_high_462B91C3-438F-4658-B5DD-36644D93CF3F_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cea232177f4ae92d06fc31db3a0ced9385b9e8e9ab11ebfbad7d363b55f092bc
+oid sha256:4827f682902eff1dae7e687af12e01d00e7b00dd85c04987195523780d934ab1
 size 4214932

+ 1 - 1
DiffuseProbeGrids/GI_A_high_78B15A3B-DF48-4FDB-82F4-D05086A1F65A_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e72e748b243420ba0b21574ffb077ae43c4afdf37b549204a3e56e9b8df68df
+oid sha256:e2053359d4bcdec0c82de33b762175b26720ed7b8ef0b93f77f7acca6570aaca
 size 1053844

+ 1 - 1
DiffuseProbeGrids/GI_A_high_9F083681-3E21-4FA6-AAC0-9A7C41C2ABE0_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:068d3b013c9cd519a47c42c18e40ef3f6187b0b8428ada9d1d22016b635fc57b
+oid sha256:775fffa3f4ea6f9ce7f467d9a3ca1de19ee0fb31d36f86142ac3a7cb57f20864
 size 16612

+ 3 - 0
DiffuseProbeGrids/GI_A_high_B_2423AC46-0FE4-41D5-8C5D-A3EEA4062700_Distance_lutrg32f.dds

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:410bd5f51924d3ff8cbdf63f29ebe7a4242979c3a8aa196df96ebbe12c5475a8
+size 819348

+ 3 - 0
DiffuseProbeGrids/GI_A_high_B_B58A0B5E-1204-4AB7-95FF-1AC9AC1E122C_Irradiance_lutrgba16f.dds

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:381beeb92138526cb70e787022a82b491f181c32999f2d9652633964adb9de65
+size 204948

+ 3 - 0
DiffuseProbeGrids/GI_A_high_B_F53F77F6-C39D-4A85-BB6D-0B177CF2F47A_ProbeData_lutrgba16f.dds

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a56f0debac45a96b01beea76de4028833d86347df532ecfecb60ecd915314a82
+size 3348

+ 1 - 1
DiffuseProbeGrids/GI_A_low_0FBFAB97-FA4D-40B6-AD8D-A05099CB0C6F_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e99b87dfbc92914e936829d8c48a34d280de4d559b118630234b63de2f6b6651
+oid sha256:a9474447ceb0235f84d4be8f35e3440b9140817acaf8aa0be21b54c8f6d8b802
 size 2308

+ 1 - 1
DiffuseProbeGrids/GI_A_low_13791D93-5F03-4306-B535-B9894721E51F_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29afdcc84247dd926453d36c27dbab145ce39d2e8f29d71e55694f84d2b6210a
+oid sha256:8e7b3391d7ef0e0ea8581617e53f7bb5609f63022c4c8b30aacbc10767ecef3c
 size 553108

+ 1 - 1
DiffuseProbeGrids/GI_A_low_F898EDBB-A70A-4E76-9284-2A794C87D8C0_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53402edeb3b77b1b47bdae6e3e4ca5ce9be0a6c3ab3ba209e3d33d2f23d31fc4
+oid sha256:350b6e69ea2b8e03d32b058842d8d5502dc0b0ff094aaeda1b1dc1e262a9aa55
 size 138388

+ 1 - 1
DiffuseProbeGrids/GI_A_mid_0865C4A5-470C-49A1-8ADD-AA2B47BE7944_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27eb6c95e6c157fd7a5c1d066bdb07d3645675b41924d30eff9fcc6a145c0a40
+oid sha256:92de960e0548dad340e84b57265b48a174dc04d3b471edbc3dd8dcfa07a6fdd7
 size 27796

+ 1 - 1
DiffuseProbeGrids/GI_A_mid_8C589AF0-EE5E-4F8A-92C6-D067E669CA76_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10ea51bbe48f5872bb1349b15b74868f2d02cff22ede28a1c7eec0cf1fd53b3c
+oid sha256:588dd1c5232738b50ea40f3f98f773ac0e9bfadee9fb32dc18d1b9304d4fb99d
 size 1769620

+ 1 - 1
DiffuseProbeGrids/GI_A_mid_CE79F73D-5EAC-43C5-B7AF-E4DCB5832BDC_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16ed3ce38ea52d0a569d8280156d5af842f065623da2dfe79b571ef934a00ce6
+oid sha256:1e2f8b62b163eb05d1952cfa384ae3a912950a3abb44778a467e5e3626902aa0
 size 7078036

+ 1 - 1
DiffuseProbeGrids/GI_B_high_3E104E70-CC21-488A-8B4E-243EB1F49BA2_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:591196099677ad8324bd7153bfcfda633c9d94b7429f79952a4cf96edaada47a
+oid sha256:3c8b2b9b5309b8294cf363bc7dc0b19d1fcbe2368574dce6b79d5b58f85049ce
 size 2685076

+ 1 - 1
DiffuseProbeGrids/GI_B_high_9E1F7FE9-9D17-4C22-84E8-CCBB8C81BCA9_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc71d72a072a4fadbbde0bf10fb85978c3fca7af10340fd5dad735e1d3929087
+oid sha256:cbb7e1a28645ccc9deaaae2b1e28cc6604dbc570c62de919b50dd65aa354f3b6
 size 10636

+ 1 - 1
DiffuseProbeGrids/GI_B_high_E3BA7825-8B51-4866-BE88-E18CABA7D90C_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:094e82583a63b56668b5b64f3dd76a61d97b5817f3a0619088af472c37419bc5
+oid sha256:33ccfcd2a0e452e70f0a78efea350d4c65de53f9c02a35d30e19e6361fcdc0da
 size 671380

+ 2 - 2
DiffuseProbeGrids/GI_B_low_1DD289CF-F9E2-4A4D-A91B-E47597614FC8_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ff89efa2fbcb332f20c1e4ea3dd40f670e18cf74867d9ccb987386487bb81c5
-size 322708
+oid sha256:aeeec97ebd2e9d65c33dd1bf953f91632705c6d0feca64a49e7774c0ca501f2e
+size 307348

+ 2 - 2
DiffuseProbeGrids/GI_B_low_B87A2E7A-37CE-4B5C-B46A-04C531877D60_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea6baa5d83e6905bdba95844e710ac1e50883d414ccf3649f3ea104d6f48a578
-size 5188
+oid sha256:5f6e6389644cff3e213d223830e49b525472d8d9a3ea227c62f475330375e4c2
+size 4948

+ 2 - 2
DiffuseProbeGrids/GI_B_low_D654C7C3-B995-4F58-A3C9-E302480EB292_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36a726a75cab85b194e4e75170ebc44bf70f2ad562bc66e6f5076701cf612bae
-size 1290388
+oid sha256:9ab99a17d8d41baa7eefe9556b6e2d013f722feeed193d4d19dfb3d7faafffb5
+size 1228948

+ 2 - 2
DiffuseProbeGrids/GI_B_mid_left_A6A7C43E-FB32-4083-A3F2-30C6A4F5B295_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f20195bd5a2306a863573650bbabc9dd83e78feeed8c08f64189ec0cd7a3105d
-size 7577748
+oid sha256:1351da3c54c1f6a7168d3629e1d22ad9a5155624716ac57b9aa6b3d2a4a094b6
+size 8714388

+ 2 - 2
DiffuseProbeGrids/GI_B_mid_left_BB26F8C4-1CB2-4628-85BA-146A25417305_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79f0a1c88d91c3d41c1327dbe35135ace5a4aa50ff7b918e889a121a3ca6e347
-size 29748
+oid sha256:50a709878e7e430ee4351984af272265f77b1f77c6a7c9a59b8abbbab4620834
+size 34188

+ 2 - 2
DiffuseProbeGrids/GI_B_mid_left_E4D6FBEE-A850-485A-BEE8-B5A959FE9829_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9c7fdbea2e70bf0893f2c25d79632aefc9bfdd39cf279e89000afcf9a9c5a85
-size 1894548
+oid sha256:4310f4de5af0d1b2b92fd7c4e93c5a3e415013f53220c291dccbccd204367178
+size 2178708

+ 1 - 1
DiffuseProbeGrids/GI_B_mid_right_00EC102E-FB1F-4A05-877E-35E693B7D164_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9ad5b53f749dd011be54051f895de76d277ac1032b6feda03908e545afa210a
+oid sha256:87443a7372c071efc842bf2f0e4061ea3b582f08cfa8de305375730ce7a015bd
 size 10608788

+ 1 - 1
DiffuseProbeGrids/GI_B_mid_right_158C953A-4481-4A9A-84E0-35D36BE30D32_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92f088bc3b5cff567a3c7bed91e2163768068075cdceebfa6eeff081db1cddef
+oid sha256:e45f9da070061e6e9a00ee41f88ebe3c22aabf2fa394cb7caad7f10b4c9edbc9
 size 2652308

+ 1 - 1
DiffuseProbeGrids/GI_B_mid_right_82767D3D-3483-4D35-A68D-25F41D3A2FC1_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a619181ba12dbff5ac77d207cfb2ef2790323915671a9b0fc872ed86f2c4cfcd
+oid sha256:b15e1bcde48b1ed420075964b5b42ca442c3307b4ebf68ef1ae5d6d032d1f9f3
 size 41588

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_025EAFCD-CA3A-46B0-B81E-35CE319648AF_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38de93e6a881f6b15a0b918564034e9f454919eb70bd65db7b2ef895bca69e37
+oid sha256:e0a14f5e769027f183ccc0ba2a8d47712e8428460b6fe359096607bb3bfe78dc
 size 322708

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_0FC57689-9F9F-41BF-BCF7-94A2C89790C9_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a403986e789e8cd3fe37d45948725b5be3ed64af6916965b3cac745521fc95ef
+oid sha256:ea46bf62d080696281a0c3c1a105ba0291480827e5509f760bff5597c2fa7bb7
 size 1130644

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_14925238-B4A4-4663-AC3E-CD485EE42F3E_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cf6349e81af320f56a230f7f39d82559b86d96e6a6d34cdbf4aa08021f037c4
+oid sha256:d87ae13f4c921d349e89cdb43960e23a1cf289a1acafb98d44e70d9e2a70a823
 size 2506900

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_197048E9-A4AF-4F1D-9251-AD0DFF40FC1F_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c0e587b034759d35bc194379c82473cddb336660cb343b8483c2c10096eb66c
+oid sha256:a17b2092614d5ee2084f24108f625265fda2969df831fc81b8b98011e6f6f270
 size 2543764

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_1E915665-8730-40D1-890B-463E40E87B7B_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56416280d6b8e1c08cec0e5bfecceaa1c54f1cbe49c270d0aa089dbf8342ac43
+oid sha256:33d683fde4df92cc8e25efed2c7c3af7f2ddff741c865de5258c10682d67e8a1
 size 9940

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_27BB77E5-B187-4A2E-A6C2-1940207B98EE_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87db2a16a0dab869f2d144880f5c8a52239f573f1141dec9a5b63e8c11c3127a
+oid sha256:eaaf1161678c82ee05cf0ea3b0b807e50aceddc43841d7f62f93a2451c493460
 size 1290388

+ 2 - 2
DiffuseProbeGrids/GI_walkway_A_2A3F3FFE-4D9A-4890-AAF0-EA195B2FB2BF_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dc6715165f18dfcfb3aac8d52e7c02a0cb16301b19980a2b6fc205b21a38b7e
-size 983188
+oid sha256:769ff31419952f25cf8956a46f0778a1a452993c47a0059617beddade1e15e49
+size 1536148

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_3D0720A0-670C-46CD-94A7-51E416A84EA1_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:326a48b8898f7636a5f904cf2666b238145feb0f46c81d2f3d909f6eed52e516
+oid sha256:4e9fdcec99fe97a319c5ddf0ea66b7536752421cc4f33407e5129f9fbde03360
 size 4564

+ 2 - 2
DiffuseProbeGrids/GI_walkway_A_532CA209-C8A2-4FCE-B8D3-B897AFD4164F_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aec4ba74ab76ee8db2785299945d5072b6c841b2a3850fca6848e3c1af00d205
-size 15508
+oid sha256:baedd3bc7cdce5ef339d6a2bb8ea29059f5e4ea8c3ebb89048d8bf055fe806e2
+size 24148

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_7DE7840B-B8A1-4B3E-9FCD-501117B14C6A_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a963f24bb92cf7a50e83fbf86452d368b9947d1c59ad8704df7e3cf33f00449
+oid sha256:5468ebbdce699258e73c55d22369fb7f81bb4d25193a206d88ba054fc66bc9de
 size 802964

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_81E8CC72-2668-4B69-9924-0A411E6D138B_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:063f03583bc9edc41568c0b839a73f5330373f9b67de73dd6d8c67f612b4637f
+oid sha256:88f6c01a3bfe47fd825c6c638bdc3e80677ec61dbdc1a9db3a386969cf544729
 size 3284

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_95DA033B-EA98-4236-8EA8-D345497B55F8_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:300394966104172ba5d04da9a0a05f13b36ae2bfad082fd390df1953b0033991
+oid sha256:5e4eb5db6fe8ada5c7a63a24599ace381b9efb084a5d7f6c2ede9aa06a696733
 size 282772

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_98E8A41D-5120-449F-A204-B11DD9B95437_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:592904b3c2670d702986e4084b11e656c4b1cd12cc4b9d8b16cb1e230caa243b
+oid sha256:9331c1c8fc0cae152c97f1f8b30ac9e918b7c45947f0b356c6218b926e37d16e
 size 636052

+ 2 - 2
DiffuseProbeGrids/GI_walkway_A_C2CB71C5-9465-4103-955D-014D46320D54_Distance_lutrg32f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:892900d938e6acf6a1a697bcff7dfea07a42217e56cff4f87de033535ce312f5
-size 3932308
+oid sha256:abe4c730d14ba4d88948f4f6949b76b4315995da859178ef4ced714e2b2319ce
+size 6144148

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_CB834C0A-23B2-45A5-AB28-6970B293768B_ProbeData_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ea1e484ee6ae455b3c7c5943f2ff7216fcbe5d1882201d01ad67dcea41c794f
+oid sha256:399c8f0917c4025e71e06918421e0458c2187e159628eb8f4a57f3dd0e50abf3
 size 5188

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_CE74DEBF-FE95-41C8-9D82-DEC100FDEFA5_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3ba649fa92e45446a6d1ab43eb8bc49d02d02be268eaa03bd73cbe7ffc49e7f
+oid sha256:acd59b5d057e1f884bfe8fce999ac3ff57280a5eb2b914492821e5a5062fca6b
 size 200852

+ 1 - 1
DiffuseProbeGrids/GI_walkway_A_F1B111FD-4FB0-46FF-943B-6FF09416B938_Irradiance_lutrgba16f.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e4947c92cfd11149e05451cb084f95a17f8122b95b2dfa5e67e9236fb32d360
+oid sha256:8a5e1367b41342627906f367d747a48b4237778151286a1a8e79fe754f283ba1
 size 626836

+ 2 - 0
Gem/Code/Include/DecalBus.h

@@ -19,6 +19,8 @@ namespace MultiplayerSample
         AZ_RTTI(MultiplayerSample::SpawnDecalConfig, "{FC3DA616-174B-48FD-9BFB-BC277132FB47}");
         inline static void Reflect(AZ::ReflectContext* context);
 
+        virtual ~SpawnDecalConfig() = default;
+
         AZ::Data::AssetId m_materialAssetId; // Asset Id of the material.
         float m_scale = 1.0f;                // Scale in meters.
         float m_opacity = 1.0f;              // How visible the decal is.

+ 1 - 1
Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.cpp

@@ -185,7 +185,7 @@ namespace MultiplayerSample
 
     AZStd::optional<const GemSpawnable> GemSpawnerComponentController::GetGemSpawnable(AZ::Crc32 gemTag) const
     {
-        for (const GemSpawnable gemType : GetParent().GetGemSpawnables())
+        for (const GemSpawnable& gemType : GetParent().GetGemSpawnables())
         {
             if (gemTag == AZ::Crc32(gemType.m_tag.c_str()))
             {

+ 1 - 1
Gem/Code/Source/Components/NetworkMatchComponent.cpp

@@ -364,7 +364,7 @@ namespace MultiplayerSample
             });
 
         AZStd::string prettyPrintMatchResults = "";
-        prettyPrintMatchResults += AZStd::string::format("Match Results (%u players)\n", results.m_playerStates.size());
+        prettyPrintMatchResults += AZStd::string::format("Match Results (%lu players)\n", results.m_playerStates.size());
         for (const PlayerState& playerState : results.m_playerStates)
         {
             prettyPrintMatchResults += AZStd::string::format("\tPlayer %s score %u, armor %u.\n", playerState.m_playerName.c_str(), playerState.m_score, playerState.m_remainingArmor);

+ 27 - 564
Levels/GameplayTest/GameplayTest.prefab

@@ -109,7 +109,6 @@
                     "Entity_[1800029023887]",
                     "Entity_[1808618958479]",
                     "Entity_[2009119671826]",
-                    "Entity_[6269723213373]",
                     "Entity_[2004824704530]",
                     "Entity_[2000529737234]",
                     "Instance_[9344504187970]/ContainerEntity",
@@ -127,7 +126,8 @@
                     "Instance_[44514490248300]/ContainerEntity",
                     "Instance_[2090718165100]/ContainerEntity",
                     "Entity_[58675766534237]",
-                    "Entity_[65620728651869]"
+                    "Entity_[65620728651869]",
+                    "Instance_[6302654760100]/ContainerEntity"
                 ]
             }
         }
@@ -11499,568 +11499,6 @@
                 }
             }
         },
-        "Entity_[6269723213373]": {
-            "Id": "Entity_[6269723213373]",
-            "Name": "Ramp",
-            "Components": {
-                "Component_[10397256755443470613]": {
-                    "$type": "EditorOnlyEntityComponent",
-                    "Id": 10397256755443470613
-                },
-                "Component_[11050547822997230207]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 11050547822997230207
-                },
-                "Component_[11987017710858805623]": {
-                    "$type": "EditorWhiteBoxComponent",
-                    "Id": 11987017710858805623,
-                    "WhiteBoxData": "T01UQQgAAAAMAAAAEgAAAAAWnTRrwAAAAL+YjLk/tu04wAAAAL9cALg/tu04wAS38D9cALg/nTRrwAS38D+YjLk/l3FuwAAAAL+AUVU8AAAAPwAAAL+AUVU8AAAAPwS38D+AUVU8l3FuwAS38D+AUVU8+BYCAQAYAAUEAgAVAQcAAAAGAgEIAwEbAgkFAAEfAwsMBgIeBwgOBQIaBgYKBwIQBQMSBAMUBQQPBwMZBAoWAQQdBQcRBAQBAQUXBAUiAAocAgYhBgkNBQYDAgcgAwgjBwsLBggHAwkTBwoJAAtYDrbtWEAAAIA/TpqFQDAZc7+27VhABLewv7btWEAAAIA/TpqFQAAAgD+27VhABLewv06ahUAEt7C/tu1YQLgAcL9OmoVAAACAPzAZc78Et7C/AAAAAAS3sL/MOIdAdFX5PgAAAAAAAIA/AAAAAAS3sL/MOIdABLewvwAAAAAAAIA/zDiHQAAAgD8AAAAAdFX5Psw4h0AEt7C/dFX5PgAAgD+27VhAuABwvwAAAAAAAIA/zDiHQHRV+T627VhAuABwv8w4h0B0Vfk+MBlzvwAAgD+27VhABLewvwAAAAB0Vfk+AAAAAAAAgD+27VhABLewv06ahUAwGXO/dFX5PgS3sL8AAAAAdFX5Pk6ahUAwGXO/dFX5PgS3sL8wGXO/AACAP+AGCRUbHxkdISPoBgQIDhIWGBwVIBsiHygWxyl8PAAAAIA9+H8/xyl8PAAAAAA9+H8/AAAAgAAAAID//3+/AAAAAAAAAAD//3+/AAAAAP//f78AAAAAAAAAgAAAgL8AAAAAiF7GPgAAAABPAWw/iF7GPgAAAABPAWw/AAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAZNd/vwAAAAAmLBA9ZNd/vwAAAAAmLBA9wsATdmVydGV4LWhpZGRlbi1wcm9wcwEAAAAAxsANcG9seWdvbi1wcm9wc8QAAAAMAAAABgAAAAIAAAAGAAAABwAAAAUAAAACAAAABAAAAAUAAAAEAAAAAgAAAAQAAAAFAAAACwAAAAIAAAAKAAAACwAAAAMAAAACAAAAAgAAAAMAAAAKAAAAAgAAAAoAAAALAAAAAgAAAAIAAAACAAAAAwAAAAkAAAACAAAACAAAAAkAAAABAAAAAgAAAAAAAAABAAAACAAAAAIAAAAIAAAACQAAAAAAAAACAAAAAAAAAAEAAAAHAAAAAgAAAAYAAAAHAAAAHAA=",
-                    "RenderData": {
-                        "Faces": [
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        -0.5,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        4.17508602142334,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        -0.5,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        1.8805851936340332,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Normal": [
-                                    0.015390819869935513,
-                                    -0.0,
-                                    0.9998815655708313
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        -0.5,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        4.17508602142334,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        1.8805851936340332,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        1.8805851936340332,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        4.17508602142334,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Normal": [
-                                    0.015390819869935513,
-                                    0.0,
-                                    0.9998815655708313
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        4.225683212280273,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        0.5,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        0.5,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        1.0
-                                    ]
-                                },
-                                "Normal": [
-                                    -0.0,
-                                    -0.0,
-                                    -0.9999999403953552
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        4.225683212280273,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        0.5,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        4.225683212280273,
-                                        1.0
-                                    ]
-                                },
-                                "Normal": [
-                                    0.0,
-                                    0.0,
-                                    -0.9999999403953552
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        4.225683212280273,
-                                        0.4869800806045532
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        0.5,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        0.4869800806045532
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        -0.5,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -0.9375109672546387
-                                    ]
-                                },
-                                "Normal": [
-                                    0.0,
-                                    -0.9999999403953552,
-                                    0.0
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        4.225683212280273,
-                                        0.4869800806045532
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        -0.5,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -0.9375109672546387
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        -0.5,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        4.17508602142334,
-                                        -0.9496030807495117
-                                    ]
-                                },
-                                "Normal": [
-                                    -0.0,
-                                    -1.0,
-                                    0.0
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        0.5,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        0.5,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        1.8805851936340332,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Normal": [
-                                    0.3874399662017822,
-                                    0.0,
-                                    0.9218949675559998
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        0.5,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        1.8805851936340332,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        -0.5,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        1.0
-                                    ]
-                                },
-                                "Normal": [
-                                    0.3874399662017822,
-                                    0.0,
-                                    0.9218949675559998
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        0.5,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        0.4869800806045532
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        4.225683212280273,
-                                        0.4869800806045532
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        1.8805851936340332,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        4.17508602142334,
-                                        -0.9496030807495117
-                                    ]
-                                },
-                                "Normal": [
-                                    0.0,
-                                    1.0,
-                                    0.0
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        0.5,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.0,
-                                        0.4869800806045532
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        1.8805851936340332,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        4.17508602142334,
-                                        -0.9496030807495117
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -2.8895087242126465,
-                                        1.8805851936340332,
-                                        1.4375109672546387
-                                    ],
-                                    "UV": [
-                                        3.3895087242126465,
-                                        -0.9375109672546387
-                                    ]
-                                },
-                                "Normal": [
-                                    0.0,
-                                    1.0,
-                                    0.0
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.4869800806045532,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        -0.5,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.4869800806045532,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        -0.5,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        -0.9496030807495117,
-                                        1.0
-                                    ]
-                                },
-                                "Normal": [
-                                    -0.999380350112915,
-                                    0.0,
-                                    0.03519835323095322
-                                ]
-                            },
-                            {
-                                "Vertex1": {
-                                    "Position": [
-                                        -3.7256829738616943,
-                                        1.8805851936340332,
-                                        0.013019919395446777
-                                    ],
-                                    "UV": [
-                                        0.4869800806045532,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Vertex2": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        -0.5,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        -0.9496030807495117,
-                                        1.0
-                                    ]
-                                },
-                                "Vertex3": {
-                                    "Position": [
-                                        -3.675086259841919,
-                                        1.8805851936340332,
-                                        1.4496030807495117
-                                    ],
-                                    "UV": [
-                                        -0.9496030807495117,
-                                        -1.3805851936340332
-                                    ]
-                                },
-                                "Normal": [
-                                    -0.999380350112915,
-                                    0.0,
-                                    0.03519835323095322
-                                ]
-                            }
-                        ]
-                    }
-                },
-                "Component_[12295523401034242674]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 12295523401034242674
-                },
-                "Component_[13084616973584100498]": {
-                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 13084616973584100498,
-                    "Parent Entity": "Entity_[356758116574]",
-                    "Transform Data": {
-                        "Translate": [
-                            -6.851195335388184,
-                            -11.523387908935547,
-                            7.243025779724121
-                        ],
-                        "Rotate": [
-                            -89.9853286743164,
-                            -1.0297627449035645,
-                            -89.184326171875
-                        ],
-                        "UniformScale": 2.8766722679138184
-                    }
-                },
-                "Component_[16669350028946059581]": {
-                    "$type": "EditorWhiteBoxColliderComponent",
-                    "Id": 16669350028946059581,
-                    "Configuration": {
-                        "MaterialSlots": {
-                            "Slots": [
-                                {
-                                    "Name": "Entire object"
-                                }
-                            ]
-                        },
-                        "propertyVisibilityFlags": 235
-                    },
-                    "MeshData": {
-                        "CookedData": "TlhTAU1FU0gPAAAAAAAAAAYAAAAIAAAADAAAAJ00a8AAAAC/mIy5P7btOMAAAAC/XAC4P7btOMAEt/A/XAC4P500a8AEt/A/mIy5P5dxbsAEt/A/gFFVPAAAAD8Et/A/gFFVPAAAAD8AAAC/gFFVPJdxbsAAAAC/gFFVPAcGAQYFAgYCAQQFBgQGBwUDAgUEAwcBAAQAAwQHAAACAwABAgsAAAAEBgcCAwkIBQsKAQBSVFJFAgAAAMh5bsDFIAC/WSBNPAAAAADFIAA/ZsfwP/qcuT8AAAAAAACAPwAAgD8AAIA/AACAP4RBhzh8bBg4cQO4NwAAAAAEAAAAAQAAAAEAAAAEAAAAAQAAAAAAAADIeW7AyHluwMh5bsDIeW7AxSAAv8UgAL+ipvA/xSAAv1kgTTxZIE08WSBNPFkgTTzFIAA/xSAAP8UgAD+F5TjAZsfwP2bH8D9mx/A/ZsfwP74QuD+ngl08+py5P/qcuT8FAAAAYwAAAKMAAADpAAAAl3FuNZdxbsAAAAC/gFFVPAAAAD8Et/A/mIy5PwwAAAAYGDAYMDAYMDAYMBg="
-                    }
-                },
-                "Component_[2482608405239556663]": {
-                    "$type": "EditorLockComponent",
-                    "Id": 2482608405239556663
-                },
-                "Component_[3178633580050940733]": {
-                    "$type": "EditorEntityIconComponent",
-                    "Id": 3178633580050940733
-                },
-                "Component_[4537987012049413452]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 4537987012049413452
-                },
-                "Component_[4551674752616433750]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 4551674752616433750
-                },
-                "Component_[7900137566441380515]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 7900137566441380515
-                }
-            }
-        },
         "Entity_[65620728651869]": {
             "Id": "Entity_[65620728651869]",
             "Name": "Entity2",
@@ -13309,6 +12747,31 @@
                 }
             ]
         },
+        "Instance_[6302654760100]": {
+            "Source": "Crate/Crate.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[13229839974588332606]/Parent Entity",
+                    "value": "../Entity_[356758116574]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[13229839974588332606]/Transform Data/Translate/0",
+                    "value": -3.2211499214172363
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[13229839974588332606]/Transform Data/Translate/1",
+                    "value": -11.162833213806152
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[13229839974588332606]/Transform Data/Translate/2",
+                    "value": -0.08550071716308594
+                }
+            ]
+        },
         "Instance_[785316907363]": {
             "Source": "Prefabs/4x4x4BoxGrid.prefab",
             "Patches": [

+ 264 - 245
Levels/NewStarbase/NewStarbase.prefab

@@ -63,6 +63,24 @@
                     "Entity_[34368826042616]"
                 ]
             },
+            "Component_[14839828467941047159]": {
+                "$type": "AZ::Render::EditorSpecularReflectionsComponent",
+                "Id": 14839828467941047159,
+                "Controller": {
+                    "Configuration": {
+                        "SSR": {
+                            "Options": {
+                                "MaxRayDistance": 20.0,
+                                "MaxDepthThreshold": 0.5,
+                                "MaxRoughness": 0.4000000059604645,
+                                "RayTracing": false,
+                                "TemporalFilteringStrength": 1.7999999523162842,
+                                "MaxLuminance": 1.0
+                            }
+                        }
+                    }
+                }
+            },
             "Component_[15230859088967841193]": {
                 "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                 "Id": 15230859088967841193,
@@ -76,6 +94,13 @@
                 "$type": "EditorDisabledCompositionComponent",
                 "Id": 16239496886950819870
             },
+            "Component_[16520239860090643580]": {
+                "$type": "GenericComponentWrapper",
+                "Id": 16520239860090643580,
+                "m_template": {
+                    "$type": "MultiplayerSample::ScriptableDecalComponent"
+                }
+            },
             "Component_[17471965783633674556]": {
                 "$type": "AZ::Render::RenderDebugEditorComponent",
                 "Id": 17471965783633674556
@@ -2378,12 +2403,12 @@
                                 0.28160524368286133
                             ],
                             "Dimensions": [
-                                33.76252746582031,
+                                51.34626007080078,
                                 25.777618408203125,
                                 10.076896667480469
                             ],
                             "TranslationOffset": [
-                                -3.614664077758789,
+                                -2.903273582458496,
                                 4.581742763519287,
                                 -6.4074554443359375
                             ]
@@ -2413,7 +2438,7 @@
                                 1.0
                             ],
                             "Extents": [
-                                33.76252746582031,
+                                51.34626007080078,
                                 25.777618408203125,
                                 10.076896667480469
                             ],
@@ -2516,6 +2541,7 @@
                     "Id": 376094705505411548,
                     "Child Entity Order": [
                         "Entity_[36715683631457]",
+                        "Entity_[445339000592182]",
                         "Entity_[2310111767322872]",
                         "Entity_[2310098882420984]",
                         "Entity_[36719978598753]",
@@ -2555,10 +2581,8 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "AxisAlignedBoxShape": {
                         "Configuration": {
-                            "IsFilled": false,
                             "Dimensions": [
                                 47.703758239746094,
                                 76.93841552734375,
@@ -2681,10 +2705,8 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "AxisAlignedBoxShape": {
                         "Configuration": {
-                            "IsFilled": false,
                             "Dimensions": [
                                 48.760066986083984,
                                 73.27322387695313,
@@ -3072,7 +3094,6 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "ShapeColor": [
                         0.19652093946933746,
                         0.8503395318984985,
@@ -3086,15 +3107,14 @@
                                 0.8503395318984985,
                                 0.251010924577713
                             ],
-                            "IsFilled": false,
                             "Dimensions": [
                                 75.54908752441406,
-                                109.77334594726563,
+                                101.67225646972656,
                                 8.113271713256836
                             ],
                             "TranslationOffset": [
                                 19.01446533203125,
-                                -8.116243362426758,
+                                -4.065708160400391,
                                 -23.24608612060547
                             ]
                         }
@@ -3124,7 +3144,7 @@
                             ],
                             "Extents": [
                                 75.54908752441406,
-                                109.77334594726563,
+                                101.67225646972656,
                                 8.113271713256836
                             ],
                             "AmbientMultiplier": 1.5,
@@ -4121,7 +4141,6 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "ShapeColor": [
                         0.08767834305763245,
                         0.730663001537323,
@@ -4135,15 +4154,14 @@
                                 0.730663001537323,
                                 0.7891203165054321
                             ],
-                            "IsFilled": false,
                             "Dimensions": [
                                 74.3277816772461,
-                                41.562599182128906,
+                                46.15409851074219,
                                 17.060176849365234
                             ],
                             "TranslationOffset": [
                                 18.403812408447266,
-                                -40.36540222167969,
+                                -42.661163330078125,
                                 -11.118890762329102
                             ]
                         }
@@ -4173,7 +4191,7 @@
                             ],
                             "Extents": [
                                 74.3277816772461,
-                                41.562599182128906,
+                                46.15409851074219,
                                 17.060176849365234
                             ],
                             "AmbientMultiplier": 1.5,
@@ -7985,7 +8003,6 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "ShapeColor": [
                         0.08767834305763245,
                         0.730663001537323,
@@ -7999,7 +8016,6 @@
                                 0.730663001537323,
                                 0.7891203165054321
                             ],
-                            "IsFilled": false,
                             "Dimensions": [
                                 74.3277816772461,
                                 56.71885681152344,
@@ -8120,10 +8136,8 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "AxisAlignedBoxShape": {
                         "Configuration": {
-                            "IsFilled": false,
                             "Dimensions": [
                                 29.857234954833984,
                                 42.60955047607422,
@@ -8244,7 +8258,6 @@
                 "Component_[13379743632906833323]": {
                     "$type": "EditorAxisAlignedBoxShapeComponent",
                     "Id": 13379743632906833323,
-                    "DisplayFilled": false,
                     "ShapeColor": [
                         0.08767834305763245,
                         0.730663001537323,
@@ -8258,7 +8271,6 @@
                                 0.730663001537323,
                                 0.7891203165054321
                             ],
-                            "IsFilled": false,
                             "Dimensions": [
                                 46.561161041259766,
                                 38.85282516479492,
@@ -10547,6 +10559,128 @@
                 }
             }
         },
+        "Entity_[445339000592182]": {
+            "Id": "Entity_[445339000592182]",
+            "Name": "GI_A_high_B",
+            "Components": {
+                "Component_[10786240963033980758]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 10786240963033980758
+                },
+                "Component_[13314812860860903037]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13314812860860903037
+                },
+                "Component_[13379743632906833323]": {
+                    "$type": "EditorAxisAlignedBoxShapeComponent",
+                    "Id": 13379743632906833323,
+                    "AxisAlignedBoxShape": {
+                        "Configuration": {
+                            "Dimensions": [
+                                21.338260650634766,
+                                20.43572998046875,
+                                11.260767936706543
+                            ],
+                            "TranslationOffset": [
+                                17.37091636657715,
+                                -16.189523696899414,
+                                -11.839725494384766
+                            ]
+                        }
+                    }
+                },
+                "Component_[1382527828894598249]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 1382527828894598249
+                },
+                "Component_[14770442202754984369]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 14770442202754984369
+                },
+                "Component_[15955738581052397708]": {
+                    "$type": "AZ::Render::EditorDiffuseProbeGridComponent",
+                    "Id": 15955738581052397708,
+                    "Controller": {
+                        "Configuration": {
+                            "ProbeSpacing": [
+                                2.0,
+                                2.0,
+                                2.5
+                            ],
+                            "Extents": [
+                                21.338260650634766,
+                                20.43572998046875,
+                                11.260767936706543
+                            ],
+                            "AmbientMultiplier": 1.5,
+                            "FrameUpdateCount": 10,
+                            "TransparencyMode": 1,
+                            "EmissiveMultiplier": 3.0,
+                            "RuntimeMode": 1,
+                            "BakedIrradianceTextureRelativePath": "DiffuseProbeGrids/GI_A_high_B_B58A0B5E-1204-4AB7-95FF-1AC9AC1E122C_Irradiance_lutrgba16f.dds",
+                            "BakedDistanceTextureRelativePath": "DiffuseProbeGrids/GI_A_high_B_2423AC46-0FE4-41D5-8C5D-A3EEA4062700_Distance_lutrg32f.dds",
+                            "BakedProbeDataTextureRelativePath": "DiffuseProbeGrids/GI_A_high_B_F53F77F6-C39D-4A85-BB6D-0B177CF2F47A_ProbeData_lutrgba16f.dds",
+                            "BakedIrradianceTextureAsset": {
+                                "assetId": {
+                                    "guid": "{2589D47A-87D4-57A2-88DE-9BA43E676DE5}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "diffuseprobegrids/gi_a_high_b_b58a0b5e-1204-4ab7-95ff-1ac9ac1e122c_irradiance_lutrgba16f.dds.streamingimage"
+                            },
+                            "BakedDistanceTextureAsset": {
+                                "assetId": {
+                                    "guid": "{72328A6D-DB18-5AFD-940D-006189802F54}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "diffuseprobegrids/gi_a_high_b_2423ac46-0fe4-41d5-8c5d-a3eea4062700_distance_lutrg32f.dds.streamingimage"
+                            },
+                            "BakedProbeDataTextureAsset": {
+                                "assetId": {
+                                    "guid": "{846C5A74-8C49-5849-AA79-2AC855D5B6AE}",
+                                    "subId": 1000
+                                },
+                                "assetHint": "diffuseprobegrids/gi_a_high_b_f53f77f6-c39d-4a85-bb6d-0b177cf2f47a_probedata_lutrgba16f.dds.streamingimage"
+                            },
+                            "VisualizationSphereRadius": 0.25
+                        }
+                    },
+                    "probeSpacingZ": 2.5,
+                    "ambientMultiplier": 1.5,
+                    "frameUpdateCount": 10,
+                    "emissiveMultiplier": 3.0,
+                    "runtimeMode": 1,
+                    "visualizationSphereRadius": 0.25
+                },
+                "Component_[16935276936499894441]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16935276936499894441
+                },
+                "Component_[6279872329549997106]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 6279872329549997106
+                },
+                "Component_[6511329904422968051]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 6511329904422968051
+                },
+                "Component_[7470007878556402827]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 7470007878556402827,
+                    "Parent Entity": "Entity_[2310094587453688]",
+                    "Transform Data": {
+                        "Translate": [
+                            14.765689849853516,
+                            -30.267658233642578,
+                            10.591827392578125
+                        ]
+                    }
+                },
+                "Component_[9505729224736002996]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9505729224736002996
+                }
+            }
+        },
         "Entity_[4521869600907512]": {
             "Id": "Entity_[4521869600907512]",
             "Name": "GI_walkway_A",
@@ -11033,7 +11167,8 @@
                         "Entity_[60296164746127]",
                         "Entity_[60309049648015]",
                         "Entity_[102544484832835]",
-                        "Entity_[2310094587453688]"
+                        "Entity_[2310094587453688]",
+                        "Entity_[689364352119803]"
                     ]
                 },
                 "Component_[9277695270015777859]": {
@@ -11430,6 +11565,71 @@
                 }
             }
         },
+        "Entity_[689364352119803]": {
+            "Id": "Entity_[689364352119803]",
+            "Name": "AmbientAudio",
+            "Components": {
+                "Component_[1109165014613855942]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 1109165014613855942,
+                    "m_template": {
+                        "$type": "AudioProxyComponent"
+                    }
+                },
+                "Component_[12437199707940482581]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12437199707940482581
+                },
+                "Component_[13145606173679161518]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13145606173679161518
+                },
+                "Component_[14774980749977237053]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14774980749977237053
+                },
+                "Component_[17049943556665966323]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 17049943556665966323
+                },
+                "Component_[1792864520108972294]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1792864520108972294
+                },
+                "Component_[1980429043338195521]": {
+                    "$type": "EditorAudioTriggerComponent",
+                    "Id": 1980429043338195521,
+                    "Play Trigger": {
+                        "controlName": "play_sx_amb_ext_general"
+                    },
+                    "Stop Trigger": {
+                        "controlName": "stop_sx_amb_ext_general"
+                    },
+                    "Plays Immediately": true
+                },
+                "Component_[2050855293059692604]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2050855293059692604
+                },
+                "Component_[4567703689688181026]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4567703689688181026,
+                    "Parent Entity": "Entity_[60274689909647]"
+                },
+                "Component_[5334430927586120432]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 5334430927586120432
+                },
+                "Component_[612576140938853376]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 612576140938853376
+                },
+                "Component_[9778753844251016872]": {
+                    "$type": "EditorBoxShapeComponent",
+                    "Id": 9778753844251016872
+                }
+            }
+        },
         "Entity_[7305267682447715]": {
             "Id": "Entity_[7305267682447715]",
             "Name": "New_Placement_3",
@@ -18284,38 +18484,38 @@
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
-                    "value": 25.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
+                    "value": "../Entity_[86126098064271]"
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/1",
-                    "value": 3.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
+                    "value": 2.6800479888916016
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
-                    "value": 55.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
+                    "value": -55.9681282043457
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
-                    "value": "../Entity_[86126098064271]"
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
+                    "value": 1.6371240615844729
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
-                    "value": 2.6800479888916016
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
+                    "value": 25.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
-                    "value": -55.9681282043457
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/1",
+                    "value": 3.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
-                    "value": 1.6371240615844729
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
+                    "value": 55.0
                 }
             ]
         },
@@ -19081,26 +19281,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -90.00000762939453
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[656261840212]/Components/Component_[16569145727191893785]/m_template/HitEffect/HitMagnitude",
-                    "value": 25.0
                 }
             ]
         },
@@ -20672,21 +20852,6 @@
         "Instance_[195069310473740]": {
             "Source": "Prefabs/Energy_Cannon_with_Energy_Ball.prefab",
             "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
-                },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Parent Entity",
@@ -20741,21 +20906,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": 84.67543029785156
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -20786,16 +20936,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -179.99989318847656
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -20826,21 +20966,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -90.00000762939453
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -28834,43 +28959,43 @@
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
-                    "value": 20.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
+                    "value": "../Entity_[86126098064271]"
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
-                    "value": 40.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
+                    "value": 38.52667236328125
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/0",
-                    "value": -20.31949234008789
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
+                    "value": -14.429194450378418
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/1",
-                    "value": 10.067258834838867
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
+                    "value": -2.6081390380859375
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
-                    "value": "../Entity_[86126098064271]"
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
+                    "value": 20.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
-                    "value": 38.52667236328125
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
+                    "value": 40.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
-                    "value": -14.429194450378418
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/0",
+                    "value": -20.31949234008789
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
-                    "value": -2.6081390380859375
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/1",
+                    "value": 10.067258834838867
                 }
             ]
         },
@@ -30720,7 +30845,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -30760,7 +30885,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -30800,7 +30925,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -30840,7 +30965,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -30880,7 +31005,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -30920,7 +31045,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -30960,7 +31085,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -31000,7 +31125,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.273830758756478e-12
+                    "value": 1.2738307587564779e-12
                 },
                 {
                     "op": "replace",
@@ -35087,31 +35212,6 @@
         "Instance_[436387970701411]": {
             "Source": "Prefabs/Energy_Cannon_with_Energy_Ball.prefab",
             "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[656261840212]/Components/Component_[16569145727191893785]/m_template/ExplosionEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[656261840212]/Components/Component_[16569145727191893785]/m_template/ExplosionEffect/EffectOffset/2",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
-                },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Parent Entity",
@@ -35625,7 +35725,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Translate/2",
-                    "value": 28.369972229003906
+                    "value": 28.369972229003903
                 },
                 {
                     "op": "replace",
@@ -35665,7 +35765,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Translate/2",
-                    "value": 28.369972229003906
+                    "value": 28.369972229003903
                 },
                 {
                     "op": "replace",
@@ -42502,16 +42602,6 @@
                     "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
                     "value": -2.6080894470214844
                 },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[10277696138249967250]/AttributeList/AttributesRawData",
-                    "value": "mpmZPwAAAAAAAAAAAAAAAAAAAAAAAIA/GFRAPgAAgD//AAAA/wAAAP8AAAD/AAAAAACAPwAAAAAAAAAAAAAAAAAAoEAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=="
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[10277696138249967250]/EditorAttributeList/AttributeCategories/3/Attributes/0/ValueBX",
-                    "value": true
-                },
                 {
                     "op": "replace",
                     "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
@@ -46736,16 +46826,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -179.99989318847656
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -46776,21 +46856,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": 1.5932101011276243
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/BallLifetimeMs",
-                    "value": 5000
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -46821,37 +46886,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -90.00000762939453
-                },
-                {
-                    "op": "add",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[13923402908884303580]",
-                    "value": {
-                        "$type": "GenericComponentWrapper",
-                        "Id": 13923402908884303580,
-                        "m_template": {
-                            "$type": "MultiplayerSample::EnergyCannonComponent",
-                            "Id": 0,
-                            "RateOfFireMs": 4000,
-                            "BallLifetimeMs": 3800,
-                            "FiringEffect": {
-                                "ParticleAsset": {
-                                    "guid": "{F16C718B-7B3D-5F6B-877C-0CA15AAE7544}",
-                                    "subId": 0
-                                },
-                                "AudioTrigger": "play_sx_int_energyballtrap_buildup",
-                                "EffectOffset": [
-                                    -1.0,
-                                    0.0,
-                                    1.100000023841858
-                                ]
-                            },
-                            "EnergyBallEntity": "../Instance_[195069310473740]/Entity_[656261840212]"
-                        }
-                    }
-                },
-                {
-                    "op": "remove",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]"
                 }
             ]
         },
@@ -46882,21 +46916,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": 89.99994659423828
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },

+ 3 - 0
Prefabs/Energy_Cannon_with_Energy_Ball.prefab

@@ -230,6 +230,9 @@
                                         "isNullPointer": false,
                                         "$type": "MultiplayerSample::SpawnDecalConfig",
                                         "value": {
+                                            "MaterialAssetId": {
+                                                "guid": "{FD203077-616F-53C5-9553-660CCB88DB7B}"
+                                            },
                                             "Scale": 2.0,
                                             "Opacity": 0.800000011920929,
                                             "LifeTimeSec": 8.0,

+ 1 - 1
Prefabs/GamePlay_Effects.prefab

@@ -120,7 +120,7 @@
                         "PlayerExertion": "play_sx_player_exertion",
                         "PlayerKnockedDown": "play_sx_player_knockdown",
                         "ArmorBreaking": "play_sx_player_armor_breaking",
-                        "ArmorMend": "play_sx_player_armor_mend",
+                        "ArmorMend": "",
                         "PlayerOuch": "play_sx_player_pain",
                         "LadderClimb": "play_sx_player_ladder_climb",
                         "ShutDown": "play_sx_ui_game_shutdown",