Import More Groceries Props into Engine

2024-01-27 19:24:28 +00:00 · 2024-01-27 19:24:28 +00:00 · 47451a9d6a
commit 47451a9d6a
parent 6d14939dce
52 changed files with 153 additions and 2 deletions
--- a/SeagullGame/Content/Items/BPI_ToiletRoll.uasset
+++ b/SeagullGame/Content/Items/BPI_ToiletRoll.uasset
--- a/SeagullGame/Content/Items/BPI_ToiletRoll_NP.uasset
+++ b/SeagullGame/Content/Items/BPI_ToiletRoll_NP.uasset
--- a/SeagullGame/Content/Mart.umap
+++ b/SeagullGame/Content/Mart.umap
--- a/SeagullGame/Content/Props/Crisp_pack_blue.uasset
+++ b/SeagullGame/Content/Props/Crisp_pack_blue.uasset
--- a/SeagullGame/Content/Props/Crisp_pack_green.uasset
+++ b/SeagullGame/Content/Props/Crisp_pack_green.uasset
--- a/SeagullGame/Content/Props/Crisp_pack_red.uasset
+++ b/SeagullGame/Content/Props/Crisp_pack_red.uasset
--- a/SeagullGame/Content/Props/Crisp_pack_yellow.uasset
+++ b/SeagullGame/Content/Props/Crisp_pack_yellow.uasset
--- a/SeagullGame/Content/Props/Pringles_blue.uasset
+++ b/SeagullGame/Content/Props/Pringles_blue.uasset
--- a/SeagullGame/Content/Props/Pringles_green.uasset
+++ b/SeagullGame/Content/Props/Pringles_green.uasset
--- a/SeagullGame/Content/Props/Pringles_red.uasset
+++ b/SeagullGame/Content/Props/Pringles_red.uasset
--- a/SeagullGame/Content/Props/Textures/M_PropFood.uasset
+++ b/SeagullGame/Content/Props/Textures/M_PropFood.uasset
--- a/SeagullGame/Content/Props/Textures/M_PropLiquid.uasset
+++ b/SeagullGame/Content/Props/Textures/M_PropLiquid.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_BaseColor.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_BaseColor.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_Emissive.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_Emissive.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_Normal.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_Normal.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_OcclusionRoughnessMetallic.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_bottle_assets_Till_black_OcclusionRoughnessMetallic.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_BaseColor.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_BaseColor.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_Emissive.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_Emissive.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_Normal.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_Normal.uasset
--- a/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_OcclusionRoughnessMetallic.uasset
+++ b/SeagullGame/Content/Props/Textures/game_jam_crisp_food_assets_export_bannana_yellow_OcclusionRoughnessMetallic.uasset
--- a/SeagullGame/Content/Props/chocolate_bar_vegimite.uasset
+++ b/SeagullGame/Content/Props/chocolate_bar_vegimite.uasset
--- a/SeagullGame/Content/Props/chocolate_caramel.uasset
+++ b/SeagullGame/Content/Props/chocolate_caramel.uasset
--- a/SeagullGame/Content/Props/chocolate_milk.uasset
+++ b/SeagullGame/Content/Props/chocolate_milk.uasset
--- a/SeagullGame/Content/Props/chocolate_pink.uasset
+++ b/SeagullGame/Content/Props/chocolate_pink.uasset
--- a/SeagullGame/Content/Props/coke_2L.uasset
+++ b/SeagullGame/Content/Props/coke_2L.uasset
--- a/SeagullGame/Content/Props/coke_bottle.uasset
+++ b/SeagullGame/Content/Props/coke_bottle.uasset
--- a/SeagullGame/Content/Props/coke_can.uasset
+++ b/SeagullGame/Content/Props/coke_can.uasset
--- a/SeagullGame/Content/Props/coke_can_L.uasset
+++ b/SeagullGame/Content/Props/coke_can_L.uasset
--- a/SeagullGame/Content/Props/diet_coke_can.uasset
+++ b/SeagullGame/Content/Props/diet_coke_can.uasset
--- a/SeagullGame/Content/Props/diet_coke_can_L.uasset
+++ b/SeagullGame/Content/Props/diet_coke_can_L.uasset
--- a/SeagullGame/Content/Props/domestos.uasset
+++ b/SeagullGame/Content/Props/domestos.uasset
--- a/SeagullGame/Content/Props/fairy_liquid.uasset
+++ b/SeagullGame/Content/Props/fairy_liquid.uasset
--- a/SeagullGame/Content/Props/fanta_2L.uasset
+++ b/SeagullGame/Content/Props/fanta_2L.uasset
--- a/SeagullGame/Content/Props/fanta_bottle.uasset
+++ b/SeagullGame/Content/Props/fanta_bottle.uasset
--- a/SeagullGame/Content/Props/fanta_can.uasset
+++ b/SeagullGame/Content/Props/fanta_can.uasset
--- a/SeagullGame/Content/Props/fanta_can_L.uasset
+++ b/SeagullGame/Content/Props/fanta_can_L.uasset
--- a/SeagullGame/Content/Props/label_1_50.uasset
+++ b/SeagullGame/Content/Props/label_1_50.uasset
--- a/SeagullGame/Content/Props/label_1_89.uasset
+++ b/SeagullGame/Content/Props/label_1_89.uasset
--- a/SeagullGame/Content/Props/pepsi_2L.uasset
+++ b/SeagullGame/Content/Props/pepsi_2L.uasset
--- a/SeagullGame/Content/Props/pepsi_can.uasset
+++ b/SeagullGame/Content/Props/pepsi_can.uasset
--- a/SeagullGame/Content/Props/pepsi_can_L.uasset
+++ b/SeagullGame/Content/Props/pepsi_can_L.uasset
--- a/SeagullGame/Content/Props/sprite_2L.uasset
+++ b/SeagullGame/Content/Props/sprite_2L.uasset
--- a/SeagullGame/Content/Props/sprite_bottle.uasset
+++ b/SeagullGame/Content/Props/sprite_bottle.uasset
--- a/SeagullGame/Content/Props/toblerone1.uasset
+++ b/SeagullGame/Content/Props/toblerone1.uasset
--- a/SeagullGame/Content/Props/wine_bottle_Bare_foot.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_Bare_foot.uasset
--- a/SeagullGame/Content/Props/wine_bottle_baileys.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_baileys.uasset
--- a/SeagullGame/Content/Props/wine_bottle_red.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_red.uasset
--- a/SeagullGame/Content/Props/wine_bottle_tall_bare_foot.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_tall_bare_foot.uasset
--- a/SeagullGame/Content/Props/wine_bottle_tall_red.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_tall_red.uasset
--- a/SeagullGame/Content/Props/wine_bottle_tall_red_yellow.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_tall_red_yellow.uasset
--- a/SeagullGame/Content/Props/wine_bottle_tall_yellow.uasset
+++ b/SeagullGame/Content/Props/wine_bottle_tall_yellow.uasset
--- a/SeagullGame/Source/SeagullGame/ItemActor.h
+++ b/SeagullGame/Source/SeagullGame/ItemActor.h
@ -14,6 +14,7 @@ enum class EItemType : uint8
 	Banana UMETA(DisplayName = "Banana"),
 	Bread UMETA(DisplayName = "Bread"),
 	Baguette UMETA(DisplayName = "Baguette"),
+	ToiletRoll UMETA(DisplayName = "ToiletRoll"),
 };

 UCLASS()