From 6263173570d2cc160f289d9a3cc03a581ed43616 Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Fri, 24 Nov 2023 16:55:41 +1000 Subject: [PATCH 1/6] SM_Pavilion with lamps --- Japan_Raid/Content/Levels/Geometry.umap | 4 ++-- Japan_Raid/Content/Levels/Light_night.umap | 4 ++-- Japan_Raid/Content/MainMap.umap | 2 +- Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset | 4 ++-- Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset | 4 ++-- Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Japan_Raid/Content/Levels/Geometry.umap b/Japan_Raid/Content/Levels/Geometry.umap index ac987c42..ac9582ee 100644 --- a/Japan_Raid/Content/Levels/Geometry.umap +++ b/Japan_Raid/Content/Levels/Geometry.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3592d71a05f89d8c65843eb8b3bd543554feb365064378f777ecd087118ae225 -size 40033778 +oid sha256:ce314bb04cd79dc293f57791f6b45eef96f1d4c057546e5b8314960894764aa5 +size 39234096 diff --git a/Japan_Raid/Content/Levels/Light_night.umap b/Japan_Raid/Content/Levels/Light_night.umap index 6ab13e13..87e2af24 100644 --- a/Japan_Raid/Content/Levels/Light_night.umap +++ b/Japan_Raid/Content/Levels/Light_night.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84843203aa69fa4cda8c115ce25a17456d7955a2d0dc500e4a828e640d883128 -size 248525 +oid sha256:aaf80638c23fe80f885f5d83317bb3a462209b5290537f93caa2d72e789e5beb +size 240724 diff --git a/Japan_Raid/Content/MainMap.umap b/Japan_Raid/Content/MainMap.umap index f3dba394..a351d177 100644 --- a/Japan_Raid/Content/MainMap.umap +++ b/Japan_Raid/Content/MainMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8207b76c98c337cd7a761ae0db524725a3acb1e8db29ee30f50959d8b95617c2 +oid sha256:b7be267da03a04751fc708831d0c8d850342813919bad31c60ee192c66de1031 size 23799 diff --git a/Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset b/Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset index 5f63e1d7..76c110d0 100644 --- a/Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset +++ b/Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81273c3a483fa836674929b829614f78b0c3511ea24f94ed89acc328e1cca03c -size 14155 +oid sha256:c6e01389964aa383a49251bb99ba9fac0e9098e900bc923e619c375e1a281180 +size 14424 diff --git a/Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset b/Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset index ae1aadfc..143b9a31 100644 --- a/Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset +++ b/Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f5f020f609c777924edff785eb781c11591024e173e7e0fd3291926348e19b5 -size 30641 +oid sha256:b4fb8409b8479438efd40577afbf85dfb66007dbda70e04017ba71ffcea4746c +size 31925 diff --git a/Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset b/Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset index 108eeb05..2de5e88d 100644 --- a/Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset +++ b/Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68e6d2152980c4bc5ec89fb63c524db6b15d84e92d796a46b257b6fdffcd95f5 -size 7899547 +oid sha256:5d349eee0c0f8560b05d02c3414d23e9bc31ea27b6247827a5573f55d9b526bd +size 7897442 From 705e0b9a6289232404b1ba7830d85b7ea6fd2c2f Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Fri, 24 Nov 2023 17:55:27 +1000 Subject: [PATCH 2/6] Sm_Lamp anim --- Japan_Raid/Content/Levels/Geometry.umap | 4 ++-- Japan_Raid/Content/MainMap.umap | 4 ++-- Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Japan_Raid/Content/Levels/Geometry.umap b/Japan_Raid/Content/Levels/Geometry.umap index ac9582ee..38638ad5 100644 --- a/Japan_Raid/Content/Levels/Geometry.umap +++ b/Japan_Raid/Content/Levels/Geometry.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce314bb04cd79dc293f57791f6b45eef96f1d4c057546e5b8314960894764aa5 -size 39234096 +oid sha256:392808e8f1f647da77bd806268f631df718ed91bcab013151c4aca36f89c1de6 +size 39237111 diff --git a/Japan_Raid/Content/MainMap.umap b/Japan_Raid/Content/MainMap.umap index a351d177..bf051c56 100644 --- a/Japan_Raid/Content/MainMap.umap +++ b/Japan_Raid/Content/MainMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7be267da03a04751fc708831d0c8d850342813919bad31c60ee192c66de1031 -size 23799 +oid sha256:f987f33d20769a2418b7aadf166a4e0fcb1275c9619404e826ba32cccd3a8e7d +size 23825 diff --git a/Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset b/Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset index 667c3d8d..5a20b610 100644 --- a/Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset +++ b/Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca36e2001dcc5c01dd018f93e62d64bdc4abea1d0095e22a3db2d2fadbddfb04 -size 545878 +oid sha256:1a49cd400b56fdb2a52f1637b93fe5ac3c22fbbe90b088f95b46c030ce177a52 +size 231561 From c9480c23ea70842e780dc0387f1c9a8b72f81e50 Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Fri, 24 Nov 2023 18:50:30 +1000 Subject: [PATCH 3/6] Shogi mats --- Japan_Raid/Content/Levels/Geometry.umap | 4 ++-- Japan_Raid/Content/Material/Props/M_Shogi.uasset | 3 +++ Japan_Raid/Content/Material/Props/M_ShogiTable.uasset | 3 +++ Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset | 4 ++-- Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset | 4 ++-- .../Content/Textures/Unique/U_ShogiTable_BaseColor.uasset | 3 +++ Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset | 3 +++ Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset | 3 +++ Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset | 3 +++ Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset | 3 +++ Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset | 3 +++ 11 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 Japan_Raid/Content/Material/Props/M_Shogi.uasset create mode 100644 Japan_Raid/Content/Material/Props/M_ShogiTable.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_ShogiTable_BaseColor.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset diff --git a/Japan_Raid/Content/Levels/Geometry.umap b/Japan_Raid/Content/Levels/Geometry.umap index 38638ad5..009b7b62 100644 --- a/Japan_Raid/Content/Levels/Geometry.umap +++ b/Japan_Raid/Content/Levels/Geometry.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:392808e8f1f647da77bd806268f631df718ed91bcab013151c4aca36f89c1de6 -size 39237111 +oid sha256:a51a0f20da198e46769d763277e6a14d9f3551a9a44a68e3d2e3ec81abfe6094 +size 39236660 diff --git a/Japan_Raid/Content/Material/Props/M_Shogi.uasset b/Japan_Raid/Content/Material/Props/M_Shogi.uasset new file mode 100644 index 00000000..26bae76e --- /dev/null +++ b/Japan_Raid/Content/Material/Props/M_Shogi.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c0474ea22b49511120c2fd08fd0d85e7ec8fda2b6e7c3b9891506cdccc5d902 +size 15179 diff --git a/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset b/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset new file mode 100644 index 00000000..0c4c3343 --- /dev/null +++ b/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e605b4d03f32304e91d60b33cf80a791949018d6a95518bac2616d33093f168c +size 10907 diff --git a/Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset b/Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset index d29ef73d..0aab77c6 100644 --- a/Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset +++ b/Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09cdf0db14030ee0c85a4709f33e13551cb09fc2f2ca4c3ebe41e4eebf2661f2 -size 647788 +oid sha256:bf4c710a2efa2caa7abec246b2990a3d2560f11a6280394b2491b0e073e633cf +size 647860 diff --git a/Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset b/Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset index af5ba63d..b43a5383 100644 --- a/Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset +++ b/Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b89c18e72c5732243118788abc231f9c794d5a1b20ab7b422fe8aec7dd1940af -size 22717 +oid sha256:aecbf3b7e015da780627fabc9a834bc90fda8e94f2dd39a57cecf0ec9e4a6c2f +size 22519 diff --git a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_BaseColor.uasset b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_BaseColor.uasset new file mode 100644 index 00000000..4032aad1 --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b3d2bcbf9a0779508227bf73e808f2d9dbf15f40a27288c196eee360a549b7a +size 11244698 diff --git a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset new file mode 100644 index 00000000..073c2a61 --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:643f3bb98a47e9ed54ef8ca92eb191805fbdb6a5104efed5b4a004a662bbefb0 +size 13378298 diff --git a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset new file mode 100644 index 00000000..d2e2b6b8 --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acae24dfb56a86f1899cdc3fb091c884be6752198d19131cff48adbffc693634 +size 14635264 diff --git a/Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset b/Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset new file mode 100644 index 00000000..499dd302 --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23c4001f63ec6465bff5dbb72b7b994e557268084914b5fc5943c4cdc2cdc5c2 +size 6513855 diff --git a/Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset b/Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset new file mode 100644 index 00000000..bb361634 --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cdeed0a09b62cc1f2422e5577a2d737d779e86a9e62bd075d2a71ff2be6b775 +size 3818074 diff --git a/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset b/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset new file mode 100644 index 00000000..0457244d --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35ffc61718984f79a4c7e1eeb83a8e35d845daee18ac0e76ea1a779cfc3d5fd3 +size 4717244 From 9b084bc03382ba4b2d2e3843dfbc1b4b8d1e3165 Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Fri, 24 Nov 2023 19:02:21 +1000 Subject: [PATCH 4/6] Shogi mats twiks --- Japan_Raid/Content/Levels/Geometry.umap | 2 +- Japan_Raid/Content/MainMap.umap | 2 +- Japan_Raid/Content/Material/Props/M_Shogi.uasset | 4 ++-- Japan_Raid/Content/Material/Props/M_ShogiTable.uasset | 4 ++-- Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset | 4 ++-- Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Japan_Raid/Content/Levels/Geometry.umap b/Japan_Raid/Content/Levels/Geometry.umap index 009b7b62..2a9eddc1 100644 --- a/Japan_Raid/Content/Levels/Geometry.umap +++ b/Japan_Raid/Content/Levels/Geometry.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a51a0f20da198e46769d763277e6a14d9f3551a9a44a68e3d2e3ec81abfe6094 +oid sha256:f7ad5e3e01eb61411d2d875c688b62e06a7c7b0feb7abe21f2d2c5b7967d0bb5 size 39236660 diff --git a/Japan_Raid/Content/MainMap.umap b/Japan_Raid/Content/MainMap.umap index bf051c56..2149a8e6 100644 --- a/Japan_Raid/Content/MainMap.umap +++ b/Japan_Raid/Content/MainMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f987f33d20769a2418b7aadf166a4e0fcb1275c9619404e826ba32cccd3a8e7d +oid sha256:6e24babfd01847299afc7032c8cfecb3dfc2a5fa0b00773662da8bf30e2e2f66 size 23825 diff --git a/Japan_Raid/Content/Material/Props/M_Shogi.uasset b/Japan_Raid/Content/Material/Props/M_Shogi.uasset index 26bae76e..095981ba 100644 --- a/Japan_Raid/Content/Material/Props/M_Shogi.uasset +++ b/Japan_Raid/Content/Material/Props/M_Shogi.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c0474ea22b49511120c2fd08fd0d85e7ec8fda2b6e7c3b9891506cdccc5d902 -size 15179 +oid sha256:31926b4dc682c7f1597cfd94e55b8f8e7fb2ed8fb312c72199afe6a060aa90d4 +size 15063 diff --git a/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset b/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset index 0c4c3343..f37f97a0 100644 --- a/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset +++ b/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e605b4d03f32304e91d60b33cf80a791949018d6a95518bac2616d33093f168c -size 10907 +oid sha256:5eebc60dce5e52bdb332963801f140bd7dd26026b2483c6c8b97e0c76d7b38ff +size 10202 diff --git a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset index d2e2b6b8..72ed4e28 100644 --- a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset +++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acae24dfb56a86f1899cdc3fb091c884be6752198d19131cff48adbffc693634 -size 14635264 +oid sha256:bb8f582266f1c4f269701088708d5614b6099e1bca1f0847aa36cacb160cb775 +size 14635317 diff --git a/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset b/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset index 0457244d..cfca7e93 100644 --- a/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset +++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35ffc61718984f79a4c7e1eeb83a8e35d845daee18ac0e76ea1a779cfc3d5fd3 -size 4717244 +oid sha256:58a8b1d1c3ac986494154d22318aba72e51777c5ef9825235b0a0ea0520b9ac0 +size 4717236 From 1fac52e02b65b03b6c8b97234858e7fffae8852e Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Fri, 24 Nov 2023 20:12:35 +1000 Subject: [PATCH 5/6] New roof mats, clear content folder --- Japan_Raid/Content/Levels/Geometry.umap | 4 ++-- Japan_Raid/Content/MainMap.umap | 2 +- .../Content/Material/Environment/M_MainHouse_Roof.uasset | 4 ++-- .../Content/Material/Environment/M_Pavilion_Roof.uasset | 3 +++ Japan_Raid/Content/SM_MainHouse.uasset | 3 --- Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset | 4 ++-- Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset | 4 ++-- .../Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset | 3 +++ Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset | 3 +++ Japan_Raid/Content/U_MainHouse_Roof_BC.uasset | 3 --- Japan_Raid/Content/U_MainHouse_Roof_N.uasset | 3 --- Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset | 3 --- Japan_Raid/Content/VFX/fireflies.uasset | 3 +++ Japan_Raid/Content/fireflies.uasset | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 Japan_Raid/Content/Material/Environment/M_Pavilion_Roof.uasset delete mode 100644 Japan_Raid/Content/SM_MainHouse.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset delete mode 100644 Japan_Raid/Content/U_MainHouse_Roof_BC.uasset delete mode 100644 Japan_Raid/Content/U_MainHouse_Roof_N.uasset delete mode 100644 Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset create mode 100644 Japan_Raid/Content/VFX/fireflies.uasset diff --git a/Japan_Raid/Content/Levels/Geometry.umap b/Japan_Raid/Content/Levels/Geometry.umap index 2a9eddc1..46c81610 100644 --- a/Japan_Raid/Content/Levels/Geometry.umap +++ b/Japan_Raid/Content/Levels/Geometry.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7ad5e3e01eb61411d2d875c688b62e06a7c7b0feb7abe21f2d2c5b7967d0bb5 -size 39236660 +oid sha256:4b61210ca69d193d3b53348067ad0aa4fc9d9a88d871a784055c70ba9a0e03b5 +size 39236872 diff --git a/Japan_Raid/Content/MainMap.umap b/Japan_Raid/Content/MainMap.umap index 2149a8e6..c40f4e55 100644 --- a/Japan_Raid/Content/MainMap.umap +++ b/Japan_Raid/Content/MainMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e24babfd01847299afc7032c8cfecb3dfc2a5fa0b00773662da8bf30e2e2f66 +oid sha256:759071414c703f069c0571102665ed19fbf94b37060314c7f9f1ad8816381a7f size 23825 diff --git a/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset b/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset index dfb7e351..45efca22 100644 --- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset +++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7232e68a45efe98f46111b91eb488e354949723cfe92c8f78e93bf59da7458d4 -size 11022 +oid sha256:75c3865ec70cddf291702aae4440101d069368fba09d70868bb9fd21894118a2 +size 11482 diff --git a/Japan_Raid/Content/Material/Environment/M_Pavilion_Roof.uasset b/Japan_Raid/Content/Material/Environment/M_Pavilion_Roof.uasset new file mode 100644 index 00000000..1c56f1e4 --- /dev/null +++ b/Japan_Raid/Content/Material/Environment/M_Pavilion_Roof.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0a9aef05003ac904d6cec285d9eeb1aef4c61e27b8368d90569d945b362dbeb +size 10452 diff --git a/Japan_Raid/Content/SM_MainHouse.uasset b/Japan_Raid/Content/SM_MainHouse.uasset deleted file mode 100644 index 67748e2e..00000000 --- a/Japan_Raid/Content/SM_MainHouse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de837c229bd068507848afb064edfea7858d60ae02045b2027bb781ff8605ae6 -size 21900905 diff --git a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset index ea43657e..ad3bb96c 100644 --- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset +++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8aec181999c941fdcca4827c4302ee9b663566c3e6371a6161933fdb0dd29830 -size 3388610 +oid sha256:38cb420405fb6ca558800d94dbc036422f39e1ab02a11cd8c1c6658a8894d1e5 +size 5827135 diff --git a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset index 38a56294..2486c0fa 100644 --- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset +++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22df8cdef9920749c6d769ace9b9f47abee1d370d757bf7a560cab248b798e16 -size 3194144 +oid sha256:17b406aed93096903e970338428c7a01cbd7e605f125ad25859f2168f31559cb +size 3239889 diff --git a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset new file mode 100644 index 00000000..9b2c159d --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5410e882d37787c42d13fbd7486aa73e8b5309b4936864104bba51c361196d8b +size 4749205 diff --git a/Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset b/Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset new file mode 100644 index 00000000..8b81ec7c --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77bd20446a3445ad4083da1e02b3fbcf976cd5081fedd74e5188fb81ca5b0348 +size 5826484 diff --git a/Japan_Raid/Content/U_MainHouse_Roof_BC.uasset b/Japan_Raid/Content/U_MainHouse_Roof_BC.uasset deleted file mode 100644 index 6ed78f72..00000000 --- a/Japan_Raid/Content/U_MainHouse_Roof_BC.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea71356a12d4a4a57ae3bd8e9f6734db739c0450e6d49796e47a4dfe13ec4e98 -size 3288054 diff --git a/Japan_Raid/Content/U_MainHouse_Roof_N.uasset b/Japan_Raid/Content/U_MainHouse_Roof_N.uasset deleted file mode 100644 index af615f42..00000000 --- a/Japan_Raid/Content/U_MainHouse_Roof_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c73acba4bbc7f5974af9c12aa41f3c79ea3484eeff5d1ad2d1e89fbe2994141 -size 3193987 diff --git a/Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset b/Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset deleted file mode 100644 index 0cbb259d..00000000 --- a/Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e173520657de6ef43cc10e3bf0c9361d22d3a1d9ccaf4508c3be11139c817491 -size 4411642 diff --git a/Japan_Raid/Content/VFX/fireflies.uasset b/Japan_Raid/Content/VFX/fireflies.uasset new file mode 100644 index 00000000..b462f192 --- /dev/null +++ b/Japan_Raid/Content/VFX/fireflies.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7e8ac8e4fc649084fdf38782aeba632f4983166d87ee394c99bac21d49d8332 +size 558040 diff --git a/Japan_Raid/Content/fireflies.uasset b/Japan_Raid/Content/fireflies.uasset index 16750676..c3882048 100644 --- a/Japan_Raid/Content/fireflies.uasset +++ b/Japan_Raid/Content/fireflies.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b32f9db089057d550464ed85a24a7e64878ca17d746d8701ea0879ca42504e2 -size 561731 +oid sha256:040724e6d1341ad0db2a9d140fa09c6ce08a6ff235c709057da0998ada2f43e6 +size 1397 From cd59d84e3892b5e4060f63d418d6183cbb4a72f9 Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Fri, 24 Nov 2023 21:19:13 +1000 Subject: [PATCH 6/6] Japanese lamp twiks --- Japan_Raid/Content/Levels/Geometry.umap | 4 ++-- Japan_Raid/Content/Levels/Light_night.umap | 4 ++-- Japan_Raid/Content/MainMap.umap | 2 +- Japan_Raid/Content/Material/01BaseSimple.uasset | 4 ++-- .../Content/Material/Blocking_material/M_paper_lamp.uasset | 4 ++-- Japan_Raid/Content/Material/M_paper.uasset | 4 ++-- Japan_Raid/Content/Material/M_paper_retry_.uasset | 4 ++-- .../S_Japanese_Wooden_Lamp.uasset | 3 +++ .../S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset | 3 --- Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset | 4 ++-- Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp.uasset delete mode 100644 Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset diff --git a/Japan_Raid/Content/Levels/Geometry.umap b/Japan_Raid/Content/Levels/Geometry.umap index 46c81610..435f9f4b 100644 --- a/Japan_Raid/Content/Levels/Geometry.umap +++ b/Japan_Raid/Content/Levels/Geometry.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b61210ca69d193d3b53348067ad0aa4fc9d9a88d871a784055c70ba9a0e03b5 -size 39236872 +oid sha256:754253cd7f3a05571f84e971b8383c5ad7c55055f23055fc9c2c6e612c102409 +size 39238025 diff --git a/Japan_Raid/Content/Levels/Light_night.umap b/Japan_Raid/Content/Levels/Light_night.umap index 87e2af24..6d12cb01 100644 --- a/Japan_Raid/Content/Levels/Light_night.umap +++ b/Japan_Raid/Content/Levels/Light_night.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaf80638c23fe80f885f5d83317bb3a462209b5290537f93caa2d72e789e5beb -size 240724 +oid sha256:cc219240d92107d3633d7efd672f5f35917004a3f2d30b972370592bbc02de10 +size 245438 diff --git a/Japan_Raid/Content/MainMap.umap b/Japan_Raid/Content/MainMap.umap index c40f4e55..6d2657a7 100644 --- a/Japan_Raid/Content/MainMap.umap +++ b/Japan_Raid/Content/MainMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:759071414c703f069c0571102665ed19fbf94b37060314c7f9f1ad8816381a7f +oid sha256:72ac80f0c0b9a8de716d1230df6181b0020590f717290c3fed11253a19a31302 size 23825 diff --git a/Japan_Raid/Content/Material/01BaseSimple.uasset b/Japan_Raid/Content/Material/01BaseSimple.uasset index 316300dd..2525eec4 100644 --- a/Japan_Raid/Content/Material/01BaseSimple.uasset +++ b/Japan_Raid/Content/Material/01BaseSimple.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d75e599fdd50283ec1ef495e1c3c0ad45fc1012eec88cd0f52828c58ac4110f2 -size 13507 +oid sha256:66bcaf2445a5f3678c3aac1db6b20332f0ae0001daeacab10c89b6ac7375f9fb +size 14921 diff --git a/Japan_Raid/Content/Material/Blocking_material/M_paper_lamp.uasset b/Japan_Raid/Content/Material/Blocking_material/M_paper_lamp.uasset index 76487b6d..e3ae24fb 100644 --- a/Japan_Raid/Content/Material/Blocking_material/M_paper_lamp.uasset +++ b/Japan_Raid/Content/Material/Blocking_material/M_paper_lamp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e15f2cb647484b9dd591ad89fd92e4e33093185fcb7b8e2df9164be225e44a58 -size 8429 +oid sha256:626f052588c7584960fc338a383955af329720517436a48d6810d50ef6342323 +size 8428 diff --git a/Japan_Raid/Content/Material/M_paper.uasset b/Japan_Raid/Content/Material/M_paper.uasset index 69945251..630e8e3b 100644 --- a/Japan_Raid/Content/Material/M_paper.uasset +++ b/Japan_Raid/Content/Material/M_paper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0037c457690266efca860823cc7d1563012500d6b4f9f25b4e0da4042879e161 -size 9945 +oid sha256:44d42bde567f3835dbe8bd167a9f9804e4eb3b82ec79da20a5c94091ca900903 +size 10594 diff --git a/Japan_Raid/Content/Material/M_paper_retry_.uasset b/Japan_Raid/Content/Material/M_paper_retry_.uasset index 89b0a9da..24a5baef 100644 --- a/Japan_Raid/Content/Material/M_paper_retry_.uasset +++ b/Japan_Raid/Content/Material/M_paper_retry_.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c676e872a8b7f4d4d89400cb0a458dda25861a78be47235764836faaaf5c4084 -size 12827 +oid sha256:f3df3e07778377366024213711041c8f4e9914b65c17143155d46cf37b9d9af7 +size 12903 diff --git a/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp.uasset b/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp.uasset new file mode 100644 index 00000000..954043cf --- /dev/null +++ b/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc52d5e7239198a694ed05b19df2cee4a585e8519947316df17758c9394b2d51 +size 231615 diff --git a/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset b/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset deleted file mode 100644 index bde044de..00000000 --- a/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a0acdac082d26b0473334ba9cb14929cd3251cf3a4279d7d677047a24e61447 -size 253724 diff --git a/Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset b/Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset index 07fdd38f..c08f17a9 100644 --- a/Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset +++ b/Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a037a27256d3d36663c91ce22b464085da1f9f1fad6b92c8ccf77e01149216de -size 16582 +oid sha256:f348d7690d3bdb8e8f0fc7784b81451d3c6e012b7f9b10034629daa1305b25cd +size 17239 diff --git a/Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset b/Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset index 45d179f1..dab9ddaf 100644 --- a/Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset +++ b/Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f6f76efddc88e3dc133b1112a56947813ac972c32c6ae80955183f81e900f1 -size 540487 +oid sha256:fdf32a090935f6de244daeb854ebfe490e87e1cc36a25488f203a15634138149 +size 540997