Merge branch 'lorealisnat:main' into main

2025-11-06 08:53:11 -07:00
parent 35da54c5a2 3ee66ed4c0
commit 01b1bb345d
115 changed files with 270 additions and 90 deletions
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel01_Closed.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel01_Closed.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel02_Closed.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel02_Closed.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel05_Closed.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel05_Closed.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel05_Open.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel05_Open.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel06_Handles.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel06_Handles.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_BarrelHolder.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_BarrelHolder.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_BarrelNarrow_Closed.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_BarrelNarrow_Closed.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel_Lid.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Barrel_Lid.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Bucket.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Bucket.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate01_Closed.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate01_Closed.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_Bin.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_Bin.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_Lid.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_Lid.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_OpenSides.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_OpenSides.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_OpenSidesLid.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/BarrelsAndCrates/SM_Crate_OpenSidesLid.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelHandle.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelHandle.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelMetal.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelMetal.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelRim.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelRim.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelSides.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelSides.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelTop.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/MI_BarrelTop.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelHandle.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelHandle.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelMetal.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelMetal.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelRim.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelRim.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelSides.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelSides.uasset
--- a/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelTop.uasset
+++ b/Elistria_Calling/Content/StarterContent/Props/Materials/BarrelMats/M_BarrelTop.uasset
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Elistria's Calling
-Devs: Lore Natusol + Kaitlyn Kinsey
+Devs: Lore Natusol
 Fantasy Third-Person RPG Project for UVU Senior Capstone
--- a/Assets/Materials/Bricks_Normal.uasset
+++ b/Assets/Materials/Bricks_Normal.uasset
--- a/Assets/Materials/MI_Roof_Tile.uasset
+++ b/Assets/Materials/MI_Roof_Tile.uasset
--- a/Assets/Materials/MI_Stone_Brick.uasset
+++ b/Assets/Materials/MI_Stone_Brick.uasset
--- a/Assets/Materials/MI_Stone_Grey.uasset
+++ b/Assets/Materials/MI_Stone_Grey.uasset
--- a/Assets/Materials/MI_Wood.uasset
+++ b/Assets/Materials/MI_Wood.uasset
--- a/Assets/Materials/MI_Wood_Boards.uasset
+++ b/Assets/Materials/MI_Wood_Boards.uasset
--- a/Assets/Materials/M_Black.uasset
+++ b/Assets/Materials/M_Black.uasset
--- a/Assets/Materials/M_Black_Metal.uasset
+++ b/Assets/Materials/M_Black_Metal.uasset
--- a/Assets/Materials/M_Brass.uasset
+++ b/Assets/Materials/M_Brass.uasset
--- a/Assets/Materials/M_Brown_Tiled_Roof.uasset
+++ b/Assets/Materials/M_Brown_Tiled_Roof.uasset
--- a/Assets/Materials/M_Brown_Tiled_Roof_01.uasset
+++ b/Assets/Materials/M_Brown_Tiled_Roof_01.uasset
--- a/Assets/Materials/M_Brown_Tiled_Roof_02.uasset
+++ b/Assets/Materials/M_Brown_Tiled_Roof_02.uasset
--- a/Assets/Materials/M_Dark_Glass.uasset
+++ b/Assets/Materials/M_Dark_Glass.uasset
--- a/Assets/Materials/M_Dark_Wood.uasset
+++ b/Assets/Materials/M_Dark_Wood.uasset
--- a/Assets/Materials/M_Orange_Plaster.uasset
+++ b/Assets/Materials/M_Orange_Plaster.uasset
--- a/Assets/Materials/M_Oxidized_Copper.uasset
+++ b/Assets/Materials/M_Oxidized_Copper.uasset
--- a/Assets/Materials/M_Plaster.uasset
+++ b/Assets/Materials/M_Plaster.uasset
--- a/Assets/Materials/M_Roof_Ridge.uasset
+++ b/Assets/Materials/M_Roof_Ridge.uasset
--- a/Assets/Materials/M_Stone_Brick.uasset
+++ b/Assets/Materials/M_Stone_Brick.uasset
--- a/Assets/Materials/M_Stone_Grey.uasset
+++ b/Assets/Materials/M_Stone_Grey.uasset
--- a/Assets/Materials/M_Tan_Trim.uasset
+++ b/Assets/Materials/M_Tan_Trim.uasset
--- a/Assets/Materials/M_Wood.uasset
+++ b/Assets/Materials/M_Wood.uasset
--- a/Assets/Materials/M_Wood_Boards.uasset
+++ b/Assets/Materials/M_Wood_Boards.uasset
--- a/Assets/Materials/Plaster_Normal.uasset
+++ b/Assets/Materials/Plaster_Normal.uasset
--- a/Assets/Materials/Roof_Tiles_Normal.uasset
+++ b/Assets/Materials/Roof_Tiles_Normal.uasset
--- a/Assets/Materials/Scratches_Normal.uasset
+++ b/Assets/Materials/Scratches_Normal.uasset
--- a/Assets/Materials/Scratches_Roughness.uasset
+++ b/Assets/Materials/Scratches_Roughness.uasset
--- a/Assets/Materials/Stone_Normal.uasset
+++ b/Assets/Materials/Stone_Normal.uasset
--- a/Assets/Materials/Wood_Boards_Normal.uasset
+++ b/Assets/Materials/Wood_Boards_Normal.uasset
--- a/Assets/Materials/Wood_Normal.uasset
+++ b/Assets/Materials/Wood_Normal.uasset
--- a/Assets/Models/SM_Gate_House.uasset
+++ b/Assets/Models/SM_Gate_House.uasset
--- a/Assets/Models/SM_Guild_Hall.uasset
+++ b/Assets/Models/SM_Guild_Hall.uasset
--- a/Assets/Models/SM_Town_Hall.uasset
+++ b/Assets/Models/SM_Town_Hall.uasset
--- a/Content/Models/Buildings/SM_Gate_House.fbx
+++ b/Content/Models/Buildings/SM_Gate_House.fbx
--- a/Content/Models/Buildings/SM_Guild_Hall.fbx
+++ b/Content/Models/Buildings/SM_Guild_Hall.fbx
--- a/Content/Models/Buildings/SM_Town_Hall.fbx
+++ b/Content/Models/Buildings/SM_Town_Hall.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_BasketBasic.fbx
+++ b/Content/Models/decor/SM_BasketBasic.fbx
--- a/Content/Models/decor/SM_BasketTallWHoles.fbx
+++ b/Content/Models/decor/SM_BasketTallWHoles.fbx
--- a/Content/Models/decor/SM_BedV1.fbx
+++ b/Content/Models/decor/SM_BedV1.fbx
--- a/Content/Models/decor/SM_BedV2.fbx
+++ b/Content/Models/decor/SM_BedV2.fbx
--- a/Content/Models/decor/SM_BottleWCork.fbx
+++ b/Content/Models/decor/SM_BottleWCork.fbx
--- a/Content/Models/decor/SM_Bowl.fbx
+++ b/Content/Models/decor/SM_Bowl.fbx
--- 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_CubeBottleWCork.fbx
+++ b/Content/Models/decor/SM_CubeBottleWCork.fbx
--- a/Content/Models/decor/SM_Cup.fbx
+++ b/Content/Models/decor/SM_Cup.fbx
--- a/Content/Models/decor/SM_DimondBottleWCork.fbx
+++ b/Content/Models/decor/SM_DimondBottleWCork.fbx
--- a/Content/Models/decor/SM_FattestBook.fbx
+++ b/Content/Models/decor/SM_FattestBook.fbx
--- a/Content/Models/decor/SM_FattiestSmothBook.fbx
+++ b/Content/Models/decor/SM_FattiestSmothBook.fbx
--- a/Content/Models/decor/SM_KeyV1.fbx
+++ b/Content/Models/decor/SM_KeyV1.fbx
--- a/Content/Models/decor/SM_PiknikBasket.fbx
+++ b/Content/Models/decor/SM_PiknikBasket.fbx
--- a/Content/Models/decor/SM_Plate.fbx
+++ b/Content/Models/decor/SM_Plate.fbx
--- a/Content/Models/decor/SM_RecTableV1.fbx
+++ b/Content/Models/decor/SM_RecTableV1.fbx
--- a/Content/Models/decor/SM_RectangleBasket.fbx
+++ b/Content/Models/decor/SM_RectangleBasket.fbx
--- a/Content/Models/decor/SM_RectangleBottle.fbx
+++ b/Content/Models/decor/SM_RectangleBottle.fbx
--- a/Content/Models/decor/SM_RoundTableV1.fbx
+++ b/Content/Models/decor/SM_RoundTableV1.fbx
--- a/Content/Models/decor/SM_RoundTableV2.fbx
+++ b/Content/Models/decor/SM_RoundTableV2.fbx
--- a/Content/Models/decor/SM_Rugg.fbx
+++ b/Content/Models/decor/SM_Rugg.fbx
--- a/Content/Models/decor/SM_SkinnyVialBottleWcork.fbx
+++ b/Content/Models/decor/SM_SkinnyVialBottleWcork.fbx
--- a/Content/Models/decor/SM_SmolFattySmothBook.fbx
+++ b/Content/Models/decor/SM_SmolFattySmothBook.fbx
--- a/Content/Models/decor/SM_SmoljewelBook.fbx
+++ b/Content/Models/decor/SM_SmoljewelBook.fbx
--- a/Content/Models/decor/SM_StoolV1.fbx
+++ b/Content/Models/decor/SM_StoolV1.fbx
--- a/Content/Models/decor/SM_TallBottleWCork.fbx
+++ b/Content/Models/decor/SM_TallBottleWCork.fbx
--- a/Content/Models/decor/SM_TallConcavedBook.fbx
+++ b/Content/Models/decor/SM_TallConcavedBook.fbx
--- a/Content/Models/decor/SM_Thinnestbook.fbx
+++ b/Content/Models/decor/SM_Thinnestbook.fbx
--- a/Content/Models/decor/SM_TreasureChestV2.fbx
+++ b/Content/Models/decor/SM_TreasureChestV2.fbx
--- a/Show More
+++ b/Show More