Merge branch 'lorealisnat:main' into main

2025-09-30 23:32:24 -06:00
parent 349859178b dd8d184da9
commit 1fae4c739f
187 changed files with 1216 additions and 30 deletions
--- a/Animations/ClimbDown.FBX
+++ b/Animations/ClimbDown.FBX
--- a/Animations/ClimbIdle.FBX
+++ b/Animations/ClimbIdle.FBX
--- a/Animations/ClimbLeft.FBX
+++ b/Animations/ClimbLeft.FBX
--- a/Animations/ClimbRight.FBX
+++ b/Animations/ClimbRight.FBX
--- a/Animations/ClimbUp.FBX
+++ b/Animations/ClimbUp.FBX
--- a/Animations/MantleLedge.FBX
+++ b/Animations/MantleLedge.FBX
--- a/Content/Models/Animals/SM_Alligator/SM_Alligator.fbx
+++ b/Content/Models/Animals/SM_Alligator/SM_Alligator.fbx
--- a/Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx
+++ b/Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx
--- a/Content/Models/Leather_Armor.fbx
+++ b/Content/Models/Leather_Armor.fbx
--- a/Content/Models/Weapons/SM_Weapon_Dagger01.fbx
+++ b/Content/Models/Weapons/SM_Weapon_Dagger01.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecaff198859df1e4c07cec4817442026df9e6a4f3841bfdfe35a0fefd33480f2
+size 49712
--- a/Content/Models/Weapons/SM_Weapon_Dagger02.fbx
+++ b/Content/Models/Weapons/SM_Weapon_Dagger02.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bb5fd75469cadb7dd0ff342f4d957c86b2e9609560184beb9c8e61ae8f1a417
+size 51376
--- a/Content/Models/Weapons/SM_Weapon_Scythe.fbx
+++ b/Content/Models/Weapons/SM_Weapon_Scythe.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b67cfedd98210a3bac165d2432827bf12e84c875678bce1065e188ab5b65d187
+size 88832
--- a/Content/Models/Weapons/SM_Weapon_Spear01.fbx
+++ b/Content/Models/Weapons/SM_Weapon_Spear01.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b518cf619a05ca7055bf04679d814991ed4fd32430cb776bebc9fb9fd263c0e7
+size 38224
--- a/Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx
+++ b/Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1be6590f61cd5a3c291cff43f30efac304cc3e85ae01a4ce14736b4e32f588da
+size 62992
--- a/Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx
+++ b/Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:787131b74b5febea618037c99ddd47f8b90580ff1544d095357ad6d025f488ba
+size 90768
--- a/Content/Models/cliffs/SM_cliff1.fbx
+++ b/Content/Models/cliffs/SM_cliff1.fbx
--- a/Content/Models/cliffs/SM_cliff2.fbx
+++ b/Content/Models/cliffs/SM_cliff2.fbx
--- a/Content/Models/cliffs/SM_cliff3.fbx
+++ b/Content/Models/cliffs/SM_cliff3.fbx
--- a/Content/Models/cliffs/SM_cliff4.fbx
+++ b/Content/Models/cliffs/SM_cliff4.fbx
--- a/Content/Models/cliffs/SM_cliff5.fbx
+++ b/Content/Models/cliffs/SM_cliff5.fbx
--- a/Content/Models/cliffs/SM_cliff6.fbx
+++ b/Content/Models/cliffs/SM_cliff6.fbx
--- a/Content/Models/cliffs/SM_cliff7.fbx
+++ b/Content/Models/cliffs/SM_cliff7.fbx
--- a/Content/Models/cliffs/SM_cliff8.fbx
+++ b/Content/Models/cliffs/SM_cliff8.fbx
--- a/Content/Models/cliffs/SM_cliff9.fbx
+++ b/Content/Models/cliffs/SM_cliff9.fbx
--- a/Content/Models/decor/Bowl.fbx
+++ b/Content/Models/decor/Bowl.fbx
--- a/Content/Models/decor/Cup.fbx
+++ b/Content/Models/decor/Cup.fbx
--- a/Content/Models/decor/Plate.fbx
+++ b/Content/Models/decor/Plate.fbx
--- a/Content/Models/decor/RecTableV1.fbx
+++ b/Content/Models/decor/RecTableV1.fbx
--- a/Content/Models/decor/RoundTableV1.fbx
+++ b/Content/Models/decor/RoundTableV1.fbx
--- a/Content/Models/decor/RoundTableV2.fbx
+++ b/Content/Models/decor/RoundTableV2.fbx
--- a/Content/Models/decor/SM_Barrel01_Closed.fbx
+++ b/Content/Models/decor/SM_Barrel01_Closed.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b132dff0e6a1cf467f56314572787ae228f88933666b03a76cb4ce97f2fd471c
+size 36800
--- a/Content/Models/decor/SM_Barrel02_Closed.fbx
+++ b/Content/Models/decor/SM_Barrel02_Closed.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c808e5c2ac1a5f4cc678d2322590aaf2f91004693321ea9bdac93a2a193c825a
+size 42704
--- a/Content/Models/decor/SM_Barrel05_Closed.fbx
+++ b/Content/Models/decor/SM_Barrel05_Closed.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c56695e86737cdb6b845ca2743be8136b1a408e726d8e1ee62b50f8ab777df00
+size 39376
--- a/Content/Models/decor/SM_Barrel05_Open.fbx
+++ b/Content/Models/decor/SM_Barrel05_Open.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93e250ebdb11444b4aeee01bfc9318c88717208b59b14f4d60d1afe12fe2b502
+size 41536
--- a/Content/Models/decor/SM_Barrel06_Handles.fbx
+++ b/Content/Models/decor/SM_Barrel06_Handles.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fe18075947d31f42619283c2f29c09b509825472bc9ae6919ecd5e634f56bf3
+size 47456
--- a/Content/Models/decor/SM_BarrelHolder.fbx
+++ b/Content/Models/decor/SM_BarrelHolder.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7966a5d0c2565ff308ad348a0a9f000c188f5984ff5e8b77d8d2c53f959eefe7
+size 36976
--- a/Content/Models/decor/SM_BarrelNarrow_Closed.fbx
+++ b/Content/Models/decor/SM_BarrelNarrow_Closed.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:638650fd2a47ead42e047fd56de09f13a293766aec764ea7e2eb074ff2e57bd7
+size 39280
--- a/Content/Models/decor/SM_Barrel_Lid.fbx
+++ b/Content/Models/decor/SM_Barrel_Lid.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6eaecd51e5374a3a98766fc491b97beecd4fa44c89ac04ed39036f4e946fb8db
+size 35600
--- a/Content/Models/decor/SM_BedV1.fbx
+++ b/Content/Models/decor/SM_BedV1.fbx
--- a/Content/Models/decor/SM_Bottle.fbx
+++ b/Content/Models/decor/SM_Bottle.fbx
--- a/Content/Models/decor/SM_BottleWCork.fbx
+++ b/Content/Models/decor/SM_BottleWCork.fbx
--- a/Content/Models/decor/SM_Bucket.fbx
+++ b/Content/Models/decor/SM_Bucket.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65aec8c8daa7c181b08d95a7c3ed2a51bb6fd08eac47c2feeacae552f43dbf2c
+size 38000
--- a/Content/Models/decor/SM_CandleHolder.fbx
+++ b/Content/Models/decor/SM_CandleHolder.fbx
--- a/Content/Models/decor/SM_CandleV1.fbx
+++ b/Content/Models/decor/SM_CandleV1.fbx
--- a/Content/Models/decor/SM_CandleV2.fbx
+++ b/Content/Models/decor/SM_CandleV2.fbx
--- a/Content/Models/decor/SM_CandleV3.fbx
+++ b/Content/Models/decor/SM_CandleV3.fbx
--- a/Content/Models/decor/SM_CandleV4.fbx
+++ b/Content/Models/decor/SM_CandleV4.fbx
--- a/Content/Models/decor/SM_Crate01_Closed.fbx
+++ b/Content/Models/decor/SM_Crate01_Closed.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9751c1befa26e8c0cb078de48d47a5d020a4a1bbb9629022fa486af9584fb20d
+size 45728
--- a/Content/Models/decor/SM_Crate_Bin.fbx
+++ b/Content/Models/decor/SM_Crate_Bin.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd336f03b5abad61170c0b7aff918b64413056a5ad8c35da28dfb278587b1e7d
+size 34272
--- a/Content/Models/decor/SM_Crate_Lid.fbx
+++ b/Content/Models/decor/SM_Crate_Lid.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:049858c5a1d8507bb8c25e289231e6266fb174aefd489e8075ed0c27ca61def1
+size 32640
--- a/Content/Models/decor/SM_Crate_OpenSides.fbx
+++ b/Content/Models/decor/SM_Crate_OpenSides.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e3f0fea8e9db0d530552c462684e117cb0e9916400d14fe7555544e67abef48
+size 35232
--- a/Content/Models/decor/SM_Crate_OpenSidesLid.fbx
+++ b/Content/Models/decor/SM_Crate_OpenSidesLid.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4fa287c9178a5afab89ae19411e8b0cbc373c3d1c536b4c97b4a9835527a28e
+size 32240
--- a/Content/Models/decor/SM_CubeBottle.fbx
+++ b/Content/Models/decor/SM_CubeBottle.fbx
--- a/Content/Models/decor/SM_CubeBottleWCork.fbx
+++ b/Content/Models/decor/SM_CubeBottleWCork.fbx
--- a/Content/Models/decor/SM_DimondBottle.fbx
+++ b/Content/Models/decor/SM_DimondBottle.fbx
--- a/Content/Models/decor/SM_DimondBottleWCork.fbx
+++ b/Content/Models/decor/SM_DimondBottleWCork.fbx
--- a/Content/Models/decor/SM_RectangleBottle.fbx
+++ b/Content/Models/decor/SM_RectangleBottle.fbx
--- a/Content/Models/decor/SM_SkinnyVialBottle.fbx
+++ b/Content/Models/decor/SM_SkinnyVialBottle.fbx
--- a/Content/Models/decor/SM_SkinnyVialBottleWcork.fbx
+++ b/Content/Models/decor/SM_SkinnyVialBottleWcork.fbx
--- a/Content/Models/decor/SM_TallBottle.fbx
+++ b/Content/Models/decor/SM_TallBottle.fbx
--- a/Content/Models/decor/SM_TallBottleWCork.fbx
+++ b/Content/Models/decor/SM_TallBottleWCork.fbx
--- a/Content/Models/decor/SM_TriangleBottle.fbx
+++ b/Content/Models/decor/SM_TriangleBottle.fbx
--- a/Content/Models/decor/SM_VialBottle.fbx
+++ b/Content/Models/decor/SM_VialBottle.fbx
--- a/Content/Models/decor/SM_VialBottleWCorkIn.fbx
+++ b/Content/Models/decor/SM_VialBottleWCorkIn.fbx
--- a/Content/Models/decor/SM_WoodShelf.fbx
+++ b/Content/Models/decor/SM_WoodShelf.fbx
--- a/Content/Models/decor/SM_bookV1.fbx
+++ b/Content/Models/decor/SM_bookV1.fbx
--- a/Content/Models/decor/StoolV1.fbx
+++ b/Content/Models/decor/StoolV1.fbx
--- a/Content/Models/decor/TreasureChestV1.fbx
+++ b/Content/Models/decor/TreasureChestV1.fbx
--- a/Content/Models/rocks/SM_rock3.fbx
+++ b/Content/Models/rocks/SM_rock3.fbx
--- a/Content/Models/rocks/SM_rock4.fbx
+++ b/Content/Models/rocks/SM_rock4.fbx
--- a/Content/Models/rocks/SM_rock5.fbx
+++ b/Content/Models/rocks/SM_rock5.fbx
--- a/Content/Models/rocks/SM_rock6.fbx
+++ b/Content/Models/rocks/SM_rock6.fbx
--- a/Content/Models/rocks/SM_rock7.fbx
+++ b/Content/Models/rocks/SM_rock7.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Large1.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Large1.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Large2.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Large2.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Large3.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Large3.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Mid1.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Mid1.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Mid2.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Mid2.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Mid3.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Mid3.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Mid4.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Mid4.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Small1.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Small1.fbx
--- a/Content/Models/trees/SM_Tree_Birch_Small2.fbx
+++ b/Content/Models/trees/SM_Tree_Birch_Small2.fbx
--- a/Content/Models/trees/SM_Tree_Oak1.fbx
+++ b/Content/Models/trees/SM_Tree_Oak1.fbx
--- a/Content/Models/trees/SM_Tree_Oak2.fbx
+++ b/Content/Models/trees/SM_Tree_Oak2.fbx
--- a/Content/Models/trees/SM_Tree_Oak3.fbx
+++ b/Content/Models/trees/SM_Tree_Oak3.fbx
--- a/Content/Models/trees/SM_Tree_Oak4.fbx
+++ b/Content/Models/trees/SM_Tree_Oak4.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Large1.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Large1.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Large2.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Large2.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Large3.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Large3.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Large4.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Large4.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Mid1.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Mid1.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Mid2.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Mid2.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Mid3.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Mid3.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Mid4.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Mid4.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Mid5.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Mid5.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Small1.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Small1.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Small2.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Small2.fbx
--- a/Content/Models/trees/SM_Tree_Pine_Small3.fbx
+++ b/Content/Models/trees/SM_Tree_Pine_Small3.fbx
--- a/Content/SM_Market_Stall_01.fbx
+++ b/Content/SM_Market_Stall_01.fbx
--- a/Content/SM_Market_Stall_02.fbx
+++ b/Content/SM_Market_Stall_02.fbx
--- a/Show More
+++ b/Show More