From 2553f471e5eccaacc3e2cbe2a889bcf0a94c78d3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 11:27:03 +0100 Subject: [PATCH] Updated Inventory for Cleanup --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset | 4 ++-- EndlessVendetta/Content/Inventory/M_Base_Rev.uasset | 3 --- EndlessVendetta/Content/Inventory/M_Base_Rot.uasset | 3 +++ EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 2 +- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI_Inventory.uasset | 3 --- EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset | 3 --- EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset | 3 --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/Inventory/InventoryComponent.cpp | 2 +- .../Source/EndlessVendetta/Inventory/InventoryComponent.h | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rev.uasset create mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rot.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_Inventory.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index bc3794e4..bd336f47 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39b6a9b90b7aa2d74ad1276c7daf693ac57799f8a7ecb1abb31e7cdf93e0e52 -size 67690 +oid sha256:e682a957f3ebb1f435625e280cf61ebd7af0d8fb7d052e424d8c629c6b55c0f6 +size 44055 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset index 096f7b65..0422e8b5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:652c5f873867461d6bff66634c30ab364f7f1ef3f45551c75b7c484e4af0d44d -size 108896 +oid sha256:64c5c7438cb4287bc4df51b9393981eb8155dc5f14525c600d6725960dce6bfd +size 108419 diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset deleted file mode 100644 index 01f423f1..00000000 --- a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddc0bd83ded6fbd643a6e2f17d8733c45f6c257ab625118ba77d639104f004b9 -size 18207 diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset new file mode 100644 index 00000000..ad45269b --- /dev/null +++ b/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc387e928b76f39cdbad7961e09b77c848b2d6df0348a0f4052bdc98976a659 +size 18207 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index f708989d..024d162f 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2c73a557df51957bac0873e8c8144c354801a6f68e7882c23e403940ac9d7e1 +oid sha256:789627d1177e0ef93075f0ca5a5b27156b16dfce514a80c543108f133a70b7d2 size 6587 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset new file mode 100644 index 00000000..e0960292 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc2d597e4dd0c95915c34a213b9a299bef8d337b839b2a8b9618a9a63d26732c +size 84945 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset new file mode 100644 index 00000000..fc14eb3f --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cce77e4317282a52477d49365a307a4673915f14b6013ee32ed2ef26800fa37 +size 563097 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset b/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset new file mode 100644 index 00000000..c6979830 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffcc3dbb5d6cafefa035c2e86c1fe4579fee9ce62abced4d4d86216caaf620f2 +size 147282 diff --git a/EndlessVendetta/Content/Inventory/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI_Inventory.uasset deleted file mode 100644 index 29548ed8..00000000 --- a/EndlessVendetta/Content/Inventory/UI_Inventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:461387a0016e4548f6916377de335db4cc9b40fa795d6a25b7b8247279b3002f -size 87922 diff --git a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset deleted file mode 100644 index 6051adc6..00000000 --- a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e272d7c78f6f03069c1262b5b64252c6992880d5135505b512715131aebc87bf -size 569790 diff --git a/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset b/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset deleted file mode 100644 index 6773c468..00000000 --- a/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d6849ec4eed10578619d45a3633b4d8540ce11c4b56ef00bfca43fe2429b480 -size 148756 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 205b9bf5..a88e02c4 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:974625bb42aeaaaec3c16d60fcf02f3a750f9bd6a87103075fcc1fc854eeadf0 -size 456337 +oid sha256:b745061f359dd7b8358b5673eda5a1d3dd75f1c17b6f70c73e177d10a0c3ebf0 +size 456284 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index b086643f..df0b4bc6 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -177,7 +177,7 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) } } -void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator Rotation) +void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { } diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index 5ba7ba28..f8a4a44f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -60,7 +60,7 @@ public: UFUNCTION(BlueprintCallable, Category="Inventory") void RemoveItem(class UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") - void SpawnItem(class UBaseItem* Item, FVector Location, FRotator Rotation); + void SpawnItem(class UBaseItem* Item, FVector Location); private: bool IsTileValid(const FInventoryTile InventoryTile) const;