Merge branch 'lorealisnat:main' into main

2025-09-09 23:47:50 -06:00
parent 797fb37960 09f6e8aca0
commit 4ec8801ba4
32 changed files with 73 additions and 15 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@ Elistria_Calling/DerivedDataCache/*
 Elistria_Calling/Saved/Crashes/

 Elistria_Calling/Saved/
+Elistria_Calling/.idea/
--- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b20f3fcc7b5b11ca9e57a7949cbb952b932b71c62c6a6a2b6cb7cea3d9153446
-size 278113
+oid sha256:132f887b0172d93247c480b7c570abaa4fc9dfe83782761266983b0889705ac1
+size 294563
--- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d17036f029f66f630044dcc90bce60fc5a066b05eed74894a8fdd0182559606
-size 25790
+oid sha256:1ac891075bcd07258fa49672b5b0c107c19c4fe98b2ebf94f8d57d4b688bacf7
+size 25350
--- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/BPC_Inventory.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/BPC_Inventory.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/DT_Recipes.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/DT_Recipes.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/SCraftingData.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/SCraftingData.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22823f152349de9623fb8236dccbd761d605cab742b5951888e4dd2a6f3cb056
-size 171154
+oid sha256:780c412f922b58cc72728a92dd394d90169b91636b3824149e7f144ce69f62c0
+size 352198
--- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_ItemSlot.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_ItemSlot.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_RecipeSlot.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_RecipeSlot.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e661218759e644ab853d2b95b2e8ccb9984ac842151d2eb6d57abf9ee1aba47
+size 103570
--- a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5c610f61b134a8292ca20bfce63d2327f12604f519a4a4d54bf334d2676b353
+size 94506
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Animals/Base/Physics_Asset/SM_grizzly_bear_PhysicsAsset.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Animals/Base/Physics_Asset/SM_grizzly_bear_PhysicsAsset.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Animals/Base/Skeletal_Mesh/SM_grizzly_bear.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Animals/Base/Skeletal_Mesh/SM_grizzly_bear.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Animals/Base/Skeleton/SM_grizzly_bear_Skeleton.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Animals/Base/Skeleton/SM_grizzly_bear_Skeleton.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Palisade_Fence_01.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Palisade_Fence_01.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Palisade_Fence_02.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Palisade_Fence_02.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Vine_Stake_Fence_01.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Vine_Stake_Fence_01.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Vine_Stake_Fence_02.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Vine_Stake_Fence_02.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Vine_Stake_Fence_03.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Fences/SM_Vine_Stake_Fence_03.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Boulder.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Boulder.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Pebble.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Pebble.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Rock1.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Rock1.uasset
--- a/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Rock2.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Mesh/Environment/Rocks/SM_Rock2.uasset
--- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
+++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85ff822d83706695fd1d41b707ee5a3c3d8d9ac5b92482da2918231d7732ca76
-size 1060185
+oid sha256:d81436aaaa88a95ed3c577f44af5264c39b7d8d3832eaa2d1fa1607591e1f0f2
+size 1108433
--- a/Elistria_Calling/Intermediate/CachedAssetRegistry_0.bin
+++ b/Elistria_Calling/Intermediate/CachedAssetRegistry_0.bin
--- a/Content/.DS_Store
+++ b/Content/.DS_Store
--- a/Content/Models/.DS_Store
+++ b/Content/Models/.DS_Store
--- a/Content/Models/Animals/SM_grizzly_bear.fbx
+++ b/Content/Models/Animals/SM_grizzly_bear.fbx
--- a/Content/Models/rocks/SM_Boulder.fbx
+++ b/Content/Models/rocks/SM_Boulder.fbx
--- a/Content/Models/rocks/SM_Pebble.fbx
+++ b/Content/Models/rocks/SM_Pebble.fbx
--- a/Content/Models/rocks/SM_Rock1.fbx
+++ b/Content/Models/rocks/SM_Rock1.fbx
--- a/Content/Models/rocks/SM_Rock2.fbx
+++ b/Content/Models/rocks/SM_Rock2.fbx