From f111e17d00d7c8a691f92bb62cb3d6d5b226bbf5 Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 14:44:36 +0200 Subject: [PATCH 01/13] Created custom glass material Signed-off-by: TjgL --- Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset | 3 +++ .../Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset | 3 +++ .../Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset | 3 +++ .../Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset | 3 +++ .../Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset create mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset create mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset create mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset create mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset diff --git a/Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset b/Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset new file mode 100644 index 0000000..1b32037 --- /dev/null +++ b/Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d04796b987a6501aa4ec447e98ddece30d1c710440cc4d909459d6116b4cea3f +size 16639 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset new file mode 100644 index 0000000..3ec7365 --- /dev/null +++ b/Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76ee9a4cacec7aaf8737268707082b2809b88dfe75a69346d613891f71eed6d9 +size 219075 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset new file mode 100644 index 0000000..a811da1 --- /dev/null +++ b/Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0d8f8c8a7b7da661bd39b9d58dbf9d796f966dad769b62f37bad64e83919f96 +size 96725 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset new file mode 100644 index 0000000..2e4d7e5 --- /dev/null +++ b/Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acce2be880e772ea3e2d067e314536aded704bf6f9a03b3970686cd3a4edfc6c +size 96698 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset new file mode 100644 index 0000000..e319031 --- /dev/null +++ b/Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b80c56daf31af31a24c580c16c1f46ce4169f67781e1825ed4c9500cc1e5711d +size 95644 From f05be593aed9cd0bf216e53dda227ebf47e844d8 Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 15:44:36 +0200 Subject: [PATCH 02/13] Imported more assets into the map Signed-off-by: TjgL --- Content/Legumix/Environment/Corridor/Cable01.uasset | 3 +++ Content/Legumix/Environment/Corridor/Cable02.uasset | 3 +++ Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset | 3 +++ Content/Legumix/Environment/Corridor/Corridor_Pillar01.uasset | 3 +++ Content/Legumix/Environment/Corridor/Corridor_Roof.uasset | 3 +++ .../Legumix/Environment/Corridor/Corridor_RoofGlass.uasset | 3 +++ .../Legumix/Environment/Corridor/Corridor_RoofShutters.uasset | 3 +++ Content/Legumix/Levels/LVL_TEST_003.umap | 4 ++-- 8 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Content/Legumix/Environment/Corridor/Cable01.uasset create mode 100644 Content/Legumix/Environment/Corridor/Cable02.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_Pillar01.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_Roof.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_RoofShutters.uasset diff --git a/Content/Legumix/Environment/Corridor/Cable01.uasset b/Content/Legumix/Environment/Corridor/Cable01.uasset new file mode 100644 index 0000000..b2dcf13 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Cable01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f65ea139b2e8875185cbaf8bf3a7c4add9333e75f6e2a8c71de5b0b793fb9a3 +size 103162 diff --git a/Content/Legumix/Environment/Corridor/Cable02.uasset b/Content/Legumix/Environment/Corridor/Cable02.uasset new file mode 100644 index 0000000..e4a2796 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Cable02.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086da9e95fb9f2c0aed34e4772a9b52cf35405e17f20d88915496a13fd77eab3 +size 103260 diff --git a/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset b/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset new file mode 100644 index 0000000..87f32bb --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d78925304c4353dccc4bb430a9cf27adac8cb791edfd9cea628c7a2f51d75a94 +size 59427 diff --git a/Content/Legumix/Environment/Corridor/Corridor_Pillar01.uasset b/Content/Legumix/Environment/Corridor/Corridor_Pillar01.uasset new file mode 100644 index 0000000..769eb40 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_Pillar01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b87d029fc3f9c5eca1937b53c1955d72c4a0ef475bf969f0d7267f45d55917e +size 59415 diff --git a/Content/Legumix/Environment/Corridor/Corridor_Roof.uasset b/Content/Legumix/Environment/Corridor/Corridor_Roof.uasset new file mode 100644 index 0000000..2e12941 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_Roof.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a86caec91490530ad8fb2006a670a8dd1ef655e101e29b0d246d463ddd0aa7 +size 56031 diff --git a/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset b/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset new file mode 100644 index 0000000..746d74b --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:494f7da191fd4dbd8c405d2d15952f65db1315284e913b722dd5e64901c81742 +size 57461 diff --git a/Content/Legumix/Environment/Corridor/Corridor_RoofShutters.uasset b/Content/Legumix/Environment/Corridor/Corridor_RoofShutters.uasset new file mode 100644 index 0000000..1148562 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_RoofShutters.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73f92c976dad6516e4894c81a77bc115a5345dac08aba08524ad045a16f66f2e +size 56662 diff --git a/Content/Legumix/Levels/LVL_TEST_003.umap b/Content/Legumix/Levels/LVL_TEST_003.umap index 008ea12..a0e02b9 100644 --- a/Content/Legumix/Levels/LVL_TEST_003.umap +++ b/Content/Legumix/Levels/LVL_TEST_003.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d671be10fce30281838a925815c851352bc3283ef2d6711ea4e7b1ff4c3a841 -size 1854485 +oid sha256:c0be38d406a527f8a307a87b758ac679c6a1ebfadaeb657d4c33f3035cb721e5 +size 1885136 From 7d6b4241e1160b7ad708a24812fbb8f7dba9c62a Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 16:11:38 +0200 Subject: [PATCH 03/13] Moved glass folder Signed-off-by: TjgL --- Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset | 3 --- .../Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset | 3 --- .../Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset | 3 --- .../Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset | 3 --- .../Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset | 3 --- Content/Legumix/Environment/Glass/M_GlassLab.uasset | 3 +++ Content/Legumix/Environment/Glass/M_GlassLabRefracted.uasset | 3 +++ Content/Legumix/Environment/Glass/T_Glass_Base_Color.uasset | 3 +++ Content/Legumix/Environment/Glass/T_Glass_Metallic.uasset | 3 +++ Content/Legumix/Environment/Glass/T_Glass_Opacity.uasset | 3 +++ Content/Legumix/Environment/Glass/T_Glass_Roughness.uasset | 3 +++ 11 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset delete mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset delete mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset delete mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset delete mode 100644 Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset create mode 100644 Content/Legumix/Environment/Glass/M_GlassLab.uasset create mode 100644 Content/Legumix/Environment/Glass/M_GlassLabRefracted.uasset create mode 100644 Content/Legumix/Environment/Glass/T_Glass_Base_Color.uasset create mode 100644 Content/Legumix/Environment/Glass/T_Glass_Metallic.uasset create mode 100644 Content/Legumix/Environment/Glass/T_Glass_Opacity.uasset create mode 100644 Content/Legumix/Environment/Glass/T_Glass_Roughness.uasset diff --git a/Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset b/Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset deleted file mode 100644 index 0aa8982..0000000 --- a/Content/Legumix/Environment/Assets/Glass/M_GlassLab.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edb0da5049b48a0a05d8ca3bd7697f2b5232beb099ed02db039b85daa6197599 -size 16494 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset deleted file mode 100644 index 3ec7365..0000000 --- a/Content/Legumix/Environment/Assets/Glass/T_Glass_Base_Color.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76ee9a4cacec7aaf8737268707082b2809b88dfe75a69346d613891f71eed6d9 -size 219075 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset deleted file mode 100644 index a811da1..0000000 --- a/Content/Legumix/Environment/Assets/Glass/T_Glass_Metallic.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0d8f8c8a7b7da661bd39b9d58dbf9d796f966dad769b62f37bad64e83919f96 -size 96725 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset deleted file mode 100644 index 2e4d7e5..0000000 --- a/Content/Legumix/Environment/Assets/Glass/T_Glass_Opacity.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acce2be880e772ea3e2d067e314536aded704bf6f9a03b3970686cd3a4edfc6c -size 96698 diff --git a/Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset b/Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset deleted file mode 100644 index e319031..0000000 --- a/Content/Legumix/Environment/Assets/Glass/T_Glass_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b80c56daf31af31a24c580c16c1f46ce4169f67781e1825ed4c9500cc1e5711d -size 95644 diff --git a/Content/Legumix/Environment/Glass/M_GlassLab.uasset b/Content/Legumix/Environment/Glass/M_GlassLab.uasset new file mode 100644 index 0000000..40f3da9 --- /dev/null +++ b/Content/Legumix/Environment/Glass/M_GlassLab.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5771d7d6bfca9ba32211c7cc702f51ebdd151834e8160a71bd462c67bd27fda6 +size 16452 diff --git a/Content/Legumix/Environment/Glass/M_GlassLabRefracted.uasset b/Content/Legumix/Environment/Glass/M_GlassLabRefracted.uasset new file mode 100644 index 0000000..1da2488 --- /dev/null +++ b/Content/Legumix/Environment/Glass/M_GlassLabRefracted.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69b4a8348f5142695ea7a0bf7446a5e92f57441b84673136b29631bad9cdd7ce +size 16702 diff --git a/Content/Legumix/Environment/Glass/T_Glass_Base_Color.uasset b/Content/Legumix/Environment/Glass/T_Glass_Base_Color.uasset new file mode 100644 index 0000000..e39a655 --- /dev/null +++ b/Content/Legumix/Environment/Glass/T_Glass_Base_Color.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc61f0510108b988f9f798690c8a0b5ba18bb5b36a73f26096a17ee390b8fe34 +size 219061 diff --git a/Content/Legumix/Environment/Glass/T_Glass_Metallic.uasset b/Content/Legumix/Environment/Glass/T_Glass_Metallic.uasset new file mode 100644 index 0000000..e670fb3 --- /dev/null +++ b/Content/Legumix/Environment/Glass/T_Glass_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0e8b74d2471181fc183de1e2912e9c06b67ad45b67d6d2527201626138dc7fa +size 96711 diff --git a/Content/Legumix/Environment/Glass/T_Glass_Opacity.uasset b/Content/Legumix/Environment/Glass/T_Glass_Opacity.uasset new file mode 100644 index 0000000..e5c5c23 --- /dev/null +++ b/Content/Legumix/Environment/Glass/T_Glass_Opacity.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f5d0009173ab1d50096b5322d78bf9c766d2373bc9a6d13d57cc5ce8235cc15 +size 96684 diff --git a/Content/Legumix/Environment/Glass/T_Glass_Roughness.uasset b/Content/Legumix/Environment/Glass/T_Glass_Roughness.uasset new file mode 100644 index 0000000..ce2b1c3 --- /dev/null +++ b/Content/Legumix/Environment/Glass/T_Glass_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b6d9ad528daa1949c02a64d8cb003df6f097c78a1494b6269aa6506beea8245 +size 95630 From b8113e3ba8cd83682ab4583b3cfc16e2ae139ffb Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 16:11:55 +0200 Subject: [PATCH 04/13] Removed incorrect mesh collisions Signed-off-by: TjgL --- Content/Legumix/Environment/Corridor/Cable01.uasset | 4 ++-- Content/Legumix/Environment/Corridor/Cable02.uasset | 4 ++-- Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset | 4 ++-- .../Legumix/Environment/Corridor/Corridor_RoofGlass.uasset | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content/Legumix/Environment/Corridor/Cable01.uasset b/Content/Legumix/Environment/Corridor/Cable01.uasset index b2dcf13..3a07376 100644 --- a/Content/Legumix/Environment/Corridor/Cable01.uasset +++ b/Content/Legumix/Environment/Corridor/Cable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f65ea139b2e8875185cbaf8bf3a7c4add9333e75f6e2a8c71de5b0b793fb9a3 -size 103162 +oid sha256:c3b8ea1a39fe1925c59c02a702193e266694597183391ccf02eb8ecc5181ad95 +size 103907 diff --git a/Content/Legumix/Environment/Corridor/Cable02.uasset b/Content/Legumix/Environment/Corridor/Cable02.uasset index e4a2796..c047d23 100644 --- a/Content/Legumix/Environment/Corridor/Cable02.uasset +++ b/Content/Legumix/Environment/Corridor/Cable02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:086da9e95fb9f2c0aed34e4772a9b52cf35405e17f20d88915496a13fd77eab3 -size 103260 +oid sha256:ecf6f7329f3756df7895492aac654e855d82eddbd64bce8ef9a03fb976ac5773 +size 104005 diff --git a/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset b/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset index 87f32bb..fe532fb 100644 --- a/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset +++ b/Content/Legumix/Environment/Corridor/Corridor_MainBeam.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d78925304c4353dccc4bb430a9cf27adac8cb791edfd9cea628c7a2f51d75a94 -size 59427 +oid sha256:ede363d40869c6694aa52d56a36f8633fd1f07ed7587c683e897f7d4e599b950 +size 60590 diff --git a/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset b/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset index 746d74b..9f4f727 100644 --- a/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset +++ b/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:494f7da191fd4dbd8c405d2d15952f65db1315284e913b722dd5e64901c81742 -size 57461 +oid sha256:f7b53a5f49f1a8499de4b9099a631b1a833f4fe30ad71639eb89ed4fdf70a7fd +size 57454 From 3216cff5075a848955c09670026e83f988bf447c Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 16:12:08 +0200 Subject: [PATCH 05/13] Added pillars to the corridor Signed-off-by: TjgL --- Content/Legumix/Environment/Corridor/Corridor_Pillar02.uasset | 3 +++ Content/Legumix/Environment/Corridor/Corridor_Pillar03.uasset | 3 +++ Content/Legumix/Environment/Corridor/Corridor_Pillar04.uasset | 3 +++ Content/Legumix/Levels/LVL_TEST_003.umap | 4 ++-- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Content/Legumix/Environment/Corridor/Corridor_Pillar02.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_Pillar03.uasset create mode 100644 Content/Legumix/Environment/Corridor/Corridor_Pillar04.uasset diff --git a/Content/Legumix/Environment/Corridor/Corridor_Pillar02.uasset b/Content/Legumix/Environment/Corridor/Corridor_Pillar02.uasset new file mode 100644 index 0000000..5da7792 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_Pillar02.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f6920ab04c6bcdce4a6e6383150108f94c8b2cae9499d117829b9da25162204 +size 62749 diff --git a/Content/Legumix/Environment/Corridor/Corridor_Pillar03.uasset b/Content/Legumix/Environment/Corridor/Corridor_Pillar03.uasset new file mode 100644 index 0000000..87d88d0 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_Pillar03.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e149eccec1a955ca4e84944bd088432b6e2cbce23a4579bf058087a7ba0be7e +size 59960 diff --git a/Content/Legumix/Environment/Corridor/Corridor_Pillar04.uasset b/Content/Legumix/Environment/Corridor/Corridor_Pillar04.uasset new file mode 100644 index 0000000..377da13 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_Pillar04.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93d61ceb32eb612196e70243a6a15a04cdefbdd8802740466bc8476a32ac6b09 +size 57969 diff --git a/Content/Legumix/Levels/LVL_TEST_003.umap b/Content/Legumix/Levels/LVL_TEST_003.umap index a0e02b9..a73ae33 100644 --- a/Content/Legumix/Levels/LVL_TEST_003.umap +++ b/Content/Legumix/Levels/LVL_TEST_003.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0be38d406a527f8a307a87b758ac679c6a1ebfadaeb657d4c33f3035cb721e5 -size 1885136 +oid sha256:2aa00e61616987708e3e9d293af253838b0721152f980629c199d04e16de662a +size 1883999 From 7f777c9519152ede35c4c30d2246286e87e63ae3 Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 16:15:13 +0200 Subject: [PATCH 06/13] Added material to cables Signed-off-by: TjgL --- Content/Legumix/Environment/Corridor/Cable01.uasset | 4 ++-- Content/Legumix/Environment/Corridor/Cable02.uasset | 4 ++-- Content/Legumix/Environment/Corridor/M_Cable.uasset | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Content/Legumix/Environment/Corridor/M_Cable.uasset diff --git a/Content/Legumix/Environment/Corridor/Cable01.uasset b/Content/Legumix/Environment/Corridor/Cable01.uasset index 3a07376..f6f2012 100644 --- a/Content/Legumix/Environment/Corridor/Cable01.uasset +++ b/Content/Legumix/Environment/Corridor/Cable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3b8ea1a39fe1925c59c02a702193e266694597183391ccf02eb8ecc5181ad95 -size 103907 +oid sha256:dd2133d0ffab5b9c334d75fccfb6b1d9b6ffebccdf8e9e77fa16682508e39531 +size 103975 diff --git a/Content/Legumix/Environment/Corridor/Cable02.uasset b/Content/Legumix/Environment/Corridor/Cable02.uasset index c047d23..3efcaa0 100644 --- a/Content/Legumix/Environment/Corridor/Cable02.uasset +++ b/Content/Legumix/Environment/Corridor/Cable02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecf6f7329f3756df7895492aac654e855d82eddbd64bce8ef9a03fb976ac5773 -size 104005 +oid sha256:5ad83c3059449ba495d465579ac3358a7e8bc12142e9b1a149322965ff72a93f +size 104055 diff --git a/Content/Legumix/Environment/Corridor/M_Cable.uasset b/Content/Legumix/Environment/Corridor/M_Cable.uasset new file mode 100644 index 0000000..67497b9 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/M_Cable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34b1bb4238d6661e3bad5c0a3aa27ec139df67a41175126479cab6c55c1bd533 +size 12746 From b809355bda1986e34c9690d5168c2bd2176140ed Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 16:24:36 +0200 Subject: [PATCH 07/13] Fixed incorrect mesh Signed-off-by: TjgL --- Content/Legumix/Environment/Corridor/M_Cable.uasset | 4 ++-- Content/Legumix/Levels/LVL_TEST_003.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Legumix/Environment/Corridor/M_Cable.uasset b/Content/Legumix/Environment/Corridor/M_Cable.uasset index 67497b9..844a564 100644 --- a/Content/Legumix/Environment/Corridor/M_Cable.uasset +++ b/Content/Legumix/Environment/Corridor/M_Cable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34b1bb4238d6661e3bad5c0a3aa27ec139df67a41175126479cab6c55c1bd533 -size 12746 +oid sha256:2393961213280fbd8f421d4aac2b75fdc6e3b42b8f02f07cd57422d243f14ec8 +size 12795 diff --git a/Content/Legumix/Levels/LVL_TEST_003.umap b/Content/Legumix/Levels/LVL_TEST_003.umap index a73ae33..2cba535 100644 --- a/Content/Legumix/Levels/LVL_TEST_003.umap +++ b/Content/Legumix/Levels/LVL_TEST_003.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2aa00e61616987708e3e9d293af253838b0721152f980629c199d04e16de662a -size 1883999 +oid sha256:066f1de80aaa95a982468393efbf2a98368b2f67c6136b30661288d558d8764f +size 1954803 From 67b348255ec0254b18af8e241671c258976dc490 Mon Sep 17 00:00:00 2001 From: Emilie Schott <43524962+EmilieSchott@users.noreply.github.com> Date: Sat, 12 Apr 2025 17:05:16 +0200 Subject: [PATCH 08/13] [FIX] Melee enemies killing each others --- Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 4 ++-- Content/Legumix/Spawner/LVL_TestSpawn.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index e34ee8b..8df0743 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e60158cce2b1abe4739326ee3cfb3c872d1460b0aeac99ce9178d3c829117c07 -size 257753 +oid sha256:442f2cd098f44eb1691b13af204f0e9f36451ad65b113b96779bfe2124bc911d +size 262792 diff --git a/Content/Legumix/Spawner/LVL_TestSpawn.umap b/Content/Legumix/Spawner/LVL_TestSpawn.umap index 9b6ae55..9aa2c26 100644 --- a/Content/Legumix/Spawner/LVL_TestSpawn.umap +++ b/Content/Legumix/Spawner/LVL_TestSpawn.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36cb7d68cdfa4a650a8d7b5eda3ede2b57ebcd8d308d6b3e6a27ecd35fe5b7fc -size 81266 +oid sha256:ecedf90fe425d082e08ed371e587646a9ca00ba244055c3a596101546e4a6a31 +size 88904 From 44695b787743b4bf0a989dd5e98a82dd1e707f20 Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 18:05:10 +0200 Subject: [PATCH 09/13] Updated map with assets for the big central wall Signed-off-by: TjgL --- .../Legumix/Environment/Corridor/Corridor_HallwayGeom.uasset | 3 +++ Content/Legumix/Environment/Lab/Lab_Bar.uasset | 3 +++ Content/Legumix/Environment/Lab/Lab_Pillar.uasset | 3 +++ Content/Legumix/Environment/Lab/M_LabPillar.uasset | 3 +++ Content/Legumix/Environment/Lab/M_LabPillar_Metal.uasset | 3 +++ Content/Legumix/Environment/Lab/SM_LabBar.uasset | 3 +++ Content/Legumix/Environment/Lab/SM_Lab_Pillar.uasset | 3 +++ Content/Legumix/Environment/Props/M_Metal_Dark.uasset | 2 +- Content/Legumix/Environment/Props/Truss_2x4.uasset | 3 +++ Content/Legumix/Levels/LVL_TEST_003.umap | 4 ++-- .../_GENERATED/Antoine/CubeGridToolOutput_5CE99485.uasset | 4 ++-- 11 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 Content/Legumix/Environment/Corridor/Corridor_HallwayGeom.uasset create mode 100644 Content/Legumix/Environment/Lab/Lab_Bar.uasset create mode 100644 Content/Legumix/Environment/Lab/Lab_Pillar.uasset create mode 100644 Content/Legumix/Environment/Lab/M_LabPillar.uasset create mode 100644 Content/Legumix/Environment/Lab/M_LabPillar_Metal.uasset create mode 100644 Content/Legumix/Environment/Lab/SM_LabBar.uasset create mode 100644 Content/Legumix/Environment/Lab/SM_Lab_Pillar.uasset create mode 100644 Content/Legumix/Environment/Props/Truss_2x4.uasset diff --git a/Content/Legumix/Environment/Corridor/Corridor_HallwayGeom.uasset b/Content/Legumix/Environment/Corridor/Corridor_HallwayGeom.uasset new file mode 100644 index 0000000..db44259 --- /dev/null +++ b/Content/Legumix/Environment/Corridor/Corridor_HallwayGeom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02c787a845c13c5143bb88556680bcc5d5ee00e4811c8e166132c136802048f5 +size 61311 diff --git a/Content/Legumix/Environment/Lab/Lab_Bar.uasset b/Content/Legumix/Environment/Lab/Lab_Bar.uasset new file mode 100644 index 0000000..4f9193f --- /dev/null +++ b/Content/Legumix/Environment/Lab/Lab_Bar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:271adf137fdef73c003b2a8e45a977c4fb585655a275d357b495884bbaafd6ad +size 1519 diff --git a/Content/Legumix/Environment/Lab/Lab_Pillar.uasset b/Content/Legumix/Environment/Lab/Lab_Pillar.uasset new file mode 100644 index 0000000..9cab322 --- /dev/null +++ b/Content/Legumix/Environment/Lab/Lab_Pillar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9e6d5e673f5d7dd1c81f34742f2ca06e83da340eefcdcfea3cb441feaad18fc +size 1550 diff --git a/Content/Legumix/Environment/Lab/M_LabPillar.uasset b/Content/Legumix/Environment/Lab/M_LabPillar.uasset new file mode 100644 index 0000000..ed5c717 --- /dev/null +++ b/Content/Legumix/Environment/Lab/M_LabPillar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e648b3223ed69340e8be563caa98cee554b11fd403a35edf581a02c30d3423e +size 53568 diff --git a/Content/Legumix/Environment/Lab/M_LabPillar_Metal.uasset b/Content/Legumix/Environment/Lab/M_LabPillar_Metal.uasset new file mode 100644 index 0000000..85a45ba --- /dev/null +++ b/Content/Legumix/Environment/Lab/M_LabPillar_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:581700494524adc2e84222df5251dce8b1060c78d750f4e67d8068aeb7137071 +size 53647 diff --git a/Content/Legumix/Environment/Lab/SM_LabBar.uasset b/Content/Legumix/Environment/Lab/SM_LabBar.uasset new file mode 100644 index 0000000..72c3216 --- /dev/null +++ b/Content/Legumix/Environment/Lab/SM_LabBar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c2a4267ddbc27258e1379bf4837b9ec7cc43e1f30d5d8ceb43787a78e8cb8a6 +size 58468 diff --git a/Content/Legumix/Environment/Lab/SM_Lab_Pillar.uasset b/Content/Legumix/Environment/Lab/SM_Lab_Pillar.uasset new file mode 100644 index 0000000..567d9b8 --- /dev/null +++ b/Content/Legumix/Environment/Lab/SM_Lab_Pillar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b32fd4a6ebd2ca59673370831e51ce3b4b277d984b86081ec6e9013ca62df181 +size 66327 diff --git a/Content/Legumix/Environment/Props/M_Metal_Dark.uasset b/Content/Legumix/Environment/Props/M_Metal_Dark.uasset index 8f92b03..26ec4d2 100644 --- a/Content/Legumix/Environment/Props/M_Metal_Dark.uasset +++ b/Content/Legumix/Environment/Props/M_Metal_Dark.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc67c48b8abba38983a69f0f4210cc6ff3ccdd38a307db05b378913968d01092 +oid sha256:366527c15905e9a46f2a2a479e8b2086006a62c783c75fbcff05eca1a2b9926e size 49879 diff --git a/Content/Legumix/Environment/Props/Truss_2x4.uasset b/Content/Legumix/Environment/Props/Truss_2x4.uasset new file mode 100644 index 0000000..995b50b --- /dev/null +++ b/Content/Legumix/Environment/Props/Truss_2x4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ed6bcc1e6ce914037bd71851ded3577c7f9ca820ef2ee4ca3e9b0512a904b80 +size 80452 diff --git a/Content/Legumix/Levels/LVL_TEST_003.umap b/Content/Legumix/Levels/LVL_TEST_003.umap index 2cba535..08dc905 100644 --- a/Content/Legumix/Levels/LVL_TEST_003.umap +++ b/Content/Legumix/Levels/LVL_TEST_003.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:066f1de80aaa95a982468393efbf2a98368b2f67c6136b30661288d558d8764f -size 1954803 +oid sha256:f5547552fa5736fab407c2d906df817db8c8d0481e8e63c1060f3b38a231c386 +size 2030644 diff --git a/Content/Legumix/Levels/_GENERATED/Antoine/CubeGridToolOutput_5CE99485.uasset b/Content/Legumix/Levels/_GENERATED/Antoine/CubeGridToolOutput_5CE99485.uasset index e98d37c..6559e86 100644 --- a/Content/Legumix/Levels/_GENERATED/Antoine/CubeGridToolOutput_5CE99485.uasset +++ b/Content/Legumix/Levels/_GENERATED/Antoine/CubeGridToolOutput_5CE99485.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f7164d641ced6ef50292e608b5c59def1c134d9b4860ed2582caccc14cecbc8 -size 497382 +oid sha256:e5c474fb81734c4b4734d9b2ed3bf8d8c96052850dbe86bdc61ebad53b321b19 +size 501804 From 819b9c8890275258eadac46bae0c9f9029ff8a23 Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 18:25:12 +0200 Subject: [PATCH 10/13] Fixed nanite error Signed-off-by: TjgL --- .../Legumix/Environment/Corridor/Corridor_RoofGlass.uasset | 4 ++-- Content/Legumix/Levels/LVL_TEST_003.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset b/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset index 9f4f727..f3e1637 100644 --- a/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset +++ b/Content/Legumix/Environment/Corridor/Corridor_RoofGlass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7b53a5f49f1a8499de4b9099a631b1a833f4fe30ad71639eb89ed4fdf70a7fd -size 57454 +oid sha256:59577058494f75084f2978e0312dff690ac694f56481373651b5f6a3cba15b7a +size 57789 diff --git a/Content/Legumix/Levels/LVL_TEST_003.umap b/Content/Legumix/Levels/LVL_TEST_003.umap index 08dc905..40ffb25 100644 --- a/Content/Legumix/Levels/LVL_TEST_003.umap +++ b/Content/Legumix/Levels/LVL_TEST_003.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5547552fa5736fab407c2d906df817db8c8d0481e8e63c1060f3b38a231c386 -size 2030644 +oid sha256:f77e531dfd06e60da677a52bb3300c64e3bd8b8397347eb32d7af9ccfe54ef85 +size 2013707 From dc23cdc14900d1ef2207f0a3b3c51e06ab64ba98 Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 18:25:30 +0200 Subject: [PATCH 11/13] Implemented return to menu on player death Signed-off-by: TjgL --- Content/Legumix/Player/BP_Play.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Legumix/Player/BP_Play.uasset b/Content/Legumix/Player/BP_Play.uasset index a1d72f5..8ea1963 100644 --- a/Content/Legumix/Player/BP_Play.uasset +++ b/Content/Legumix/Player/BP_Play.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8124a920456d11db618ac49d0a4e2a1c02fd498cc577fd44f8651ffdc65495c -size 680659 +oid sha256:f4e327eaf7055c17df485b45aea49f152835f0f37dda9cc52d58403864de7513 +size 690314 From 5c63254784ba0b5b7e25788f04b8bc3260097d5c Mon Sep 17 00:00:00 2001 From: TjgL Date: Sat, 12 Apr 2025 18:35:00 +0200 Subject: [PATCH 12/13] Fixed a random fire sound playing at the start of the game Signed-off-by: TjgL --- Content/Legumix/Weapon/Revolver/BP_Revolver.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset index 1e9cba5..129cca2 100644 --- a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset +++ b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24e45e07e713d91c0d6ce2fd043e61d7b4f9d651968331978c0fce1c6f57dbbd -size 41824 +oid sha256:9ba61848d5405959118e361ed0122cc2b7866bf8278b75a883c62becbfca8cfb +size 41727 From 31bfa7e94fb27ded3acbbaad00e6cf14a0817d6a Mon Sep 17 00:00:00 2001 From: Emilie Schott <43524962+EmilieSchott@users.noreply.github.com> Date: Sat, 12 Apr 2025 18:35:37 +0200 Subject: [PATCH 13/13] [FIX] Blackboard not found for enemies EQS context --- .../RangeEnemy/AI/Context/EQC_DistantEnemyLocations.uasset | 4 ++-- .../RangeEnemy/AI/Context/EQC_MeleeEnemyLocations.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_DistantEnemyLocations.uasset b/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_DistantEnemyLocations.uasset index 4e927ca..85fad9b 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_DistantEnemyLocations.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_DistantEnemyLocations.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bb8c6af4dbccad6f6eedf1f513bb98cb87fdc350b08e30db198db4342d9f3a0 -size 96811 +oid sha256:ca98d5dca555b0525d754be9ecedb8648a1cc0cf670ec18024dd8fb22c84b716 +size 100517 diff --git a/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_MeleeEnemyLocations.uasset b/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_MeleeEnemyLocations.uasset index 7d96bd3..c1ec050 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_MeleeEnemyLocations.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/AI/Context/EQC_MeleeEnemyLocations.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8920c3d1dd0b2989f154aff98438915432d26e134325e0b85e78e64a0aa4acf6 -size 57206 +oid sha256:a04455f961449c51d3cf17a385512577c3c1c43000d5a37c83fbde94ab593661 +size 61255