Merge branch 'dev' into AnimationFixes

MashdorDev · Feb 14, 2024 · 43a388c · 43a388c
2 parents cc599e5 + 6b2869f
commit 43a388c
Show file tree

Hide file tree

Showing 31 changed files with 92 additions and 2 deletions.
diff --git a/Content/Unbread/Art/Environment_Assets/Oven_10x6.uasset b/Content/Unbread/Art/Environment_Assets/Oven_10x6.uasset
diff --git a/Content/Unbread/Art/Environment_Assets/SM_Oven_10x6.uasset b/Content/Unbread/Art/Environment_Assets/SM_Oven_10x6.uasset
diff --git a/Content/Unbread/Art/Environment_Assets/SM_Table_10x6.uasset b/Content/Unbread/Art/Environment_Assets/SM_Table_10x6.uasset
diff --git a/Content/Unbread/Art/Environment_Assets/SM_Table_6x6.uasset b/Content/Unbread/Art/Environment_Assets/SM_Table_6x6.uasset
diff --git a/Content/Unbread/Art/Props/SM_Bowl.uasset b/Content/Unbread/Art/Props/SM_Bowl.uasset
diff --git a/Content/Unbread/Art/Props/SM_Coffee_Mug.uasset b/Content/Unbread/Art/Props/SM_Coffee_Mug.uasset
diff --git a/Content/Unbread/Art/Props/SM_Cupcake_Cherry.uasset b/Content/Unbread/Art/Props/SM_Cupcake_Cherry.uasset
diff --git a/Content/Unbread/Art/Props/SM_Cupcake_Chocolate.uasset b/Content/Unbread/Art/Props/SM_Cupcake_Chocolate.uasset
diff --git a/Content/Unbread/Art/Props/SM_Cupcake_Heart.uasset b/Content/Unbread/Art/Props/SM_Cupcake_Heart.uasset
diff --git a/Content/Unbread/Art/Props/SM_Cupcake_Stand.uasset b/Content/Unbread/Art/Props/SM_Cupcake_Stand.uasset
diff --git a/Content/Unbread/Art/Props/SM_Cutting_Board.uasset b/Content/Unbread/Art/Props/SM_Cutting_Board.uasset
diff --git a/Content/Unbread/Art/Props/SM_Dish_Dryer.uasset b/Content/Unbread/Art/Props/SM_Dish_Dryer.uasset
diff --git a/Content/Unbread/Art/Props/SM_Dispenser_Cream.uasset b/Content/Unbread/Art/Props/SM_Dispenser_Cream.uasset
diff --git a/Content/Unbread/Art/Props/SM_Dispenser_Large.uasset b/Content/Unbread/Art/Props/SM_Dispenser_Large.uasset
diff --git a/Content/Unbread/Art/Props/SM_Dispenser_Pink.uasset b/Content/Unbread/Art/Props/SM_Dispenser_Pink.uasset
diff --git a/Content/Unbread/Art/Props/SM_Dispenser_Whipped_Cream.uasset b/Content/Unbread/Art/Props/SM_Dispenser_Whipped_Cream.uasset
diff --git a/Content/Unbread/Art/Props/SM_Knife_Bread.uasset b/Content/Unbread/Art/Props/SM_Knife_Bread.uasset
diff --git a/Content/Unbread/Art/Props/SM_Knife_Sharp.uasset b/Content/Unbread/Art/Props/SM_Knife_Sharp.uasset
diff --git a/Content/Unbread/Art/Props/SM_Pan_Dough.uasset b/Content/Unbread/Art/Props/SM_Pan_Dough.uasset
diff --git a/Content/Unbread/Art/Props/SM_Plate_1.uasset b/Content/Unbread/Art/Props/SM_Plate_1.uasset
diff --git a/Content/Unbread/Art/Props/SM_Plate_2.uasset b/Content/Unbread/Art/Props/SM_Plate_2.uasset
diff --git a/Content/Unbread/Art/Props/SM_Plate_3.uasset b/Content/Unbread/Art/Props/SM_Plate_3.uasset
diff --git a/Content/Unbread/Art/Props/SM_Plate_Teacup_Blue.uasset b/Content/Unbread/Art/Props/SM_Plate_Teacup_Blue.uasset
diff --git a/Content/Unbread/Art/Props/SM_Plate_Teacup_Pink.uasset b/Content/Unbread/Art/Props/SM_Plate_Teacup_Pink.uasset
diff --git a/Content/Unbread/Art/Props/SM_Plate_Teacup_White.uasset b/Content/Unbread/Art/Props/SM_Plate_Teacup_White.uasset
diff --git a/Content/Unbread/Art/Props/SM_Rolling_Pin.uasset b/Content/Unbread/Art/Props/SM_Rolling_Pin.uasset
diff --git a/Content/Unbread/Art/Props/Teacup.uasset b/Content/Unbread/Art/Props/Teacup.uasset
diff --git a/Content/Unbread/Art/Props/Teapot.uasset b/Content/Unbread/Art/Props/Teapot.uasset
diff --git a/Content/Unbread/Art/Props/Trolley_Dough_Pans.uasset b/Content/Unbread/Art/Props/Trolley_Dough_Pans.uasset
diff --git a/Content/Unbread/Art/Props/Trolley_Small.uasset b/Content/Unbread/Art/Props/Trolley_Small.uasset
diff --git a/Content/Unbread/Maps/ModelTestLevel.umap b/Content/Unbread/Maps/ModelTestLevel.umap