From 48265335ad3dbc3b79652dc466872cf4a569e1df Mon Sep 17 00:00:00 2001 From: kel0060 <kirill.keleshidi.st@vsb.cz> Date: Wed, 25 Sep 2024 22:31:52 +0200 Subject: [PATCH] 1 make spider ui hunger bar working properly with vr help 2 make bootle from static mesh actor to the actor bp 3 add to spider food grub component 4 delete swabra due to problem with lighting --- Content/Hub_arena.umap | 4 ++-- Content/Island.umap | 4 ++-- Content/Models/Bottle_AC_BP.uasset | 3 +++ Content/Models/Curly_hair_Spider_BP/Curly_hair_spader.uasset | 4 ++-- .../Curly_hair_Spider_BP/Spider_food/Spider_food.uasset | 4 ++-- Content/Models/Glass_Bottle_Blueprint.uasset | 4 ++-- Content/Models/NOTRIGHTBP/Glass_Bottle_Blueprint.uasset | 3 +++ Content/Models/Swabra/Material.uasset | 3 --- Content/Models/Swabra/Material_001.uasset | 3 --- Content/Models/Swabra/svabra.uasset | 3 --- Content/Models/svabra_BP.uasset | 3 --- Content/ProceduralNaturePack/Assets_Overview.umap | 3 --- Content/ProceduralNaturePack/Demo_Scene.umap | 3 --- .../EPIC_StarterContent/Blueprints/BP_LightStudio.uasset | 3 --- .../Meshes/trees_w_roots/large_tree_w_roots_a.uasset | 3 --- Content/Spider_House.umap | 4 ++-- Content/Testing_area.umap | 4 ++-- Content/VRTemplate/Blueprints/GrabComponent.uasset | 4 ++-- Content/VRTemplate/Inventory_System/BP_inventorySlot.uasset | 4 ++-- 19 files changed, 24 insertions(+), 42 deletions(-) create mode 100644 Content/Models/Bottle_AC_BP.uasset create mode 100644 Content/Models/NOTRIGHTBP/Glass_Bottle_Blueprint.uasset delete mode 100644 Content/Models/Swabra/Material.uasset delete mode 100644 Content/Models/Swabra/Material_001.uasset delete mode 100644 Content/Models/Swabra/svabra.uasset delete mode 100644 Content/Models/svabra_BP.uasset delete mode 100644 Content/ProceduralNaturePack/Assets_Overview.umap delete mode 100644 Content/ProceduralNaturePack/Demo_Scene.umap delete mode 100644 Content/ProceduralNaturePack/EPIC_StarterContent/Blueprints/BP_LightStudio.uasset delete mode 100644 Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset diff --git a/Content/Hub_arena.umap b/Content/Hub_arena.umap index 62af411b..6baaa31f 100644 --- a/Content/Hub_arena.umap +++ b/Content/Hub_arena.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2524bce4dc745af261a0bb06d7f353037b1fef72fa9757b92cfec90eee14d000 -size 123486 +oid sha256:1bf1daf3a247c0c39405156a086020d1614dc56b221e946ec509814e87ea3504 +size 123963 diff --git a/Content/Island.umap b/Content/Island.umap index b66fe0bb..e13561ba 100644 --- a/Content/Island.umap +++ b/Content/Island.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac84c044e1ded7363baf6b7f17891c82d1d8c90c050b755d76b02d110c951e86 -size 17247891 +oid sha256:fc3fb0a679843ea659bac832cb8b5de3ead381b14cf21fc8d4397e8682b23328 +size 17248092 diff --git a/Content/Models/Bottle_AC_BP.uasset b/Content/Models/Bottle_AC_BP.uasset new file mode 100644 index 00000000..11a74ac9 --- /dev/null +++ b/Content/Models/Bottle_AC_BP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eebf0e05e2de77f3dc35ff5c1847f1739449dae1eb8a7c83c7cc940f2be5da27 +size 30452 diff --git a/Content/Models/Curly_hair_Spider_BP/Curly_hair_spader.uasset b/Content/Models/Curly_hair_Spider_BP/Curly_hair_spader.uasset index 0d525815..2bd309f4 100644 --- a/Content/Models/Curly_hair_Spider_BP/Curly_hair_spader.uasset +++ b/Content/Models/Curly_hair_Spider_BP/Curly_hair_spader.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5227f00dcb5a2695b35c68135e89e39b19be2c5a142100f4b0c80b3d4c9ad486 -size 324198 +oid sha256:0fbf2ee29af7ff7f2d23a454304561deab1e44f3624cea12386473d52d73b6e5 +size 320162 diff --git a/Content/Models/Curly_hair_Spider_BP/Spider_food/Spider_food.uasset b/Content/Models/Curly_hair_Spider_BP/Spider_food/Spider_food.uasset index be03234a..13c3f8f4 100644 --- a/Content/Models/Curly_hair_Spider_BP/Spider_food/Spider_food.uasset +++ b/Content/Models/Curly_hair_Spider_BP/Spider_food/Spider_food.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c65329e5efbe3adc4831661926412d60223d60e4c60d79627d68a532fd8f19e -size 31880 +oid sha256:1b0c68fffb4edbd76f9270416b214bcfe9e2062626e27d6221f875028d353761 +size 34387 diff --git a/Content/Models/Glass_Bottle_Blueprint.uasset b/Content/Models/Glass_Bottle_Blueprint.uasset index de2b9b72..f3b05255 100644 --- a/Content/Models/Glass_Bottle_Blueprint.uasset +++ b/Content/Models/Glass_Bottle_Blueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1e41bc043a79cf6f4d92ccc334faf64400f834e85923489f5e3380bc20490ac -size 31719 +oid sha256:b960859c39645400edbd903753888c53b6b4b7d6acb62afc88763403d08941f0 +size 2632 diff --git a/Content/Models/NOTRIGHTBP/Glass_Bottle_Blueprint.uasset b/Content/Models/NOTRIGHTBP/Glass_Bottle_Blueprint.uasset new file mode 100644 index 00000000..82673b2c --- /dev/null +++ b/Content/Models/NOTRIGHTBP/Glass_Bottle_Blueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d387fa1d27a5bf3805de454a3052691df9ae5da75114108160b8003239de9134 +size 31784 diff --git a/Content/Models/Swabra/Material.uasset b/Content/Models/Swabra/Material.uasset deleted file mode 100644 index 40ee32ed..00000000 --- a/Content/Models/Swabra/Material.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42dcfa7a8e30e00702b7d85bb33d5885bfe7889cf4077af087fbaf36e944a068 -size 9268 diff --git a/Content/Models/Swabra/Material_001.uasset b/Content/Models/Swabra/Material_001.uasset deleted file mode 100644 index 906a355f..00000000 --- a/Content/Models/Swabra/Material_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31e739f376c7096c4d203a3acd54c1d0eb3330df55cbbb70c3ace49e6aa7ab74 -size 7785 diff --git a/Content/Models/Swabra/svabra.uasset b/Content/Models/Swabra/svabra.uasset deleted file mode 100644 index 7192fde8..00000000 --- a/Content/Models/Swabra/svabra.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5402c3a61e36bd1df4742d61bd9a3e51950f9d2770bed9097e5558eb237a5c9 -size 35844 diff --git a/Content/Models/svabra_BP.uasset b/Content/Models/svabra_BP.uasset deleted file mode 100644 index bc38fea4..00000000 --- a/Content/Models/svabra_BP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:267b65cb606c9bff3d4816079518475a2cf28c07fdceb1d84d63b0105e708fe7 -size 32530 diff --git a/Content/ProceduralNaturePack/Assets_Overview.umap b/Content/ProceduralNaturePack/Assets_Overview.umap deleted file mode 100644 index bddab0b3..00000000 --- a/Content/ProceduralNaturePack/Assets_Overview.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e6e5a44ead5a971a36021b6a316e0919ec0d817183cdf49c42f6a562ff66e22 -size 31687946 diff --git a/Content/ProceduralNaturePack/Demo_Scene.umap b/Content/ProceduralNaturePack/Demo_Scene.umap deleted file mode 100644 index 48e8e056..00000000 --- a/Content/ProceduralNaturePack/Demo_Scene.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3928162c7b2594140da31098c6dbe31b3eb02fb178c96c0821aad340b189c16 -size 36374951 diff --git a/Content/ProceduralNaturePack/EPIC_StarterContent/Blueprints/BP_LightStudio.uasset b/Content/ProceduralNaturePack/EPIC_StarterContent/Blueprints/BP_LightStudio.uasset deleted file mode 100644 index 4a6f99d8..00000000 --- a/Content/ProceduralNaturePack/EPIC_StarterContent/Blueprints/BP_LightStudio.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9cf70dee6deee90b1c00c75d19583cd624f13eaef862e7a80b1a0553656a996 -size 1278509 diff --git a/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset b/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset deleted file mode 100644 index 2cb8382f..00000000 --- a/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99173d33b4aac204451a46c54e6a19454568dc9c329b5b52f7d78adacda5609f -size 16341992 diff --git a/Content/Spider_House.umap b/Content/Spider_House.umap index 60e9d48f..700f13aa 100644 --- a/Content/Spider_House.umap +++ b/Content/Spider_House.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa9622b3057c7c6f8f6ff02c11407dbffb7156fbb0bc315af4e3463b06fbca31 -size 933031 +oid sha256:e39e914fa99236d5ab08709c95e5141d80730e246516c7ee7a41fd78b4bd972b +size 929955 diff --git a/Content/Testing_area.umap b/Content/Testing_area.umap index 3b1e5b45..d0829554 100644 --- a/Content/Testing_area.umap +++ b/Content/Testing_area.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12f84be029e9a2dfbea0128c3cdcadab0de01aadc89cd4ec6b304973c64b0a0d -size 1641911 +oid sha256:959dda9c0256c4031eb0b78e4bae736572e7246d34e63fa07bec75c81fe51fa4 +size 1646920 diff --git a/Content/VRTemplate/Blueprints/GrabComponent.uasset b/Content/VRTemplate/Blueprints/GrabComponent.uasset index 9397c071..b5897c2e 100644 --- a/Content/VRTemplate/Blueprints/GrabComponent.uasset +++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95c0981f29945ad4e4d04ddc4fedf62cc10ce810ad832ef87965916d577eeb49 -size 257751 +oid sha256:314e0ce3d017df37e49369e078d205d5a64568037b5ebe34621daa34825c8071 +size 260194 diff --git a/Content/VRTemplate/Inventory_System/BP_inventorySlot.uasset b/Content/VRTemplate/Inventory_System/BP_inventorySlot.uasset index de7857a3..31dc0af8 100644 --- a/Content/VRTemplate/Inventory_System/BP_inventorySlot.uasset +++ b/Content/VRTemplate/Inventory_System/BP_inventorySlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ded4b6a3778a31528cf08ce4a68e0dd2c9d5990e80711f672f4968399928088 -size 33424 +oid sha256:94e8e7f5371a7ad91a3ca489882618f6ac526d57aecfcb414fd2d48c1080df4f +size 238114 -- GitLab