From 41623a5663817b487aa7c2a960936b97bc45307d Mon Sep 17 00:00:00 2001 From: Srujan Lokhande Date: Sun, 29 Sep 2024 11:57:20 +0530 Subject: [PATCH] Last push --- .../.idea.InventorySystem/.idea/workspace.xml | 39 +++++++++++------- .../Mannequins/Animations/ABP_Manny.uasset | Bin 533437 -> 532724 bytes .../Mannequins/Meshes/SK_Mannequin.uasset | Bin 151018 -> 151534 bytes .../Blueprints/BP_Sword.uasset | Bin 0 -> 29123 bytes .../Blueprints/BP_Tablet.uasset | Bin 32027 -> 31264 bytes .../Blueprints/BP_ThirdPersonCharacter.uasset | Bin 49978 -> 50926 bytes .../ThirdPerson/Maps/LVL_MainMap.umap | Bin 66790 -> 66790 bytes .../UI/WBP_CharacterDisplayWidget.uasset | Bin 0 -> 31644 bytes .../UI/WBP_InventoryWidget.uasset | Bin 43381 -> 47466 bytes .../Materials/M_RenderTargetDisplay.uasset | Bin 0 -> 10636 bytes .../Materials/RT_PlayerRenderTarget.uasset | Bin 0 -> 4506 bytes InventorySystem.sln.DotSettings.user | 5 +++ .../InventorySystemCharacter.cpp | 35 ++++++++++++++++ .../InventorySystemCharacter.h | 17 +++++++- .../InventorySystem/Private/Actors/Pickup.cpp | 2 +- .../InventorySystem/Private/Actors/Sword.cpp | 15 +++++++ .../Actors/CharacterDisplayWidget.cpp | 36 ++++++++++++++++ Source/InventorySystem/Public/Actors/Sword.h | 20 +++++++++ .../InventorySystem/Public/Items/ItemBase.h | 2 + .../Actors/CharacterDisplayWidget.h | 35 ++++++++++++++++ .../Public/UserInterface/InventorySystemHUD.h | 5 ++- 21 files changed, 194 insertions(+), 17 deletions(-) create mode 100644 Content/InventorySystem/Blueprints/BP_Sword.uasset create mode 100644 Content/InventorySystem/UI/WBP_CharacterDisplayWidget.uasset create mode 100644 Content/Materials/M_RenderTargetDisplay.uasset create mode 100644 Content/Materials/RT_PlayerRenderTarget.uasset create mode 100644 InventorySystem.sln.DotSettings.user create mode 100644 Source/InventorySystem/Private/Actors/Sword.cpp create mode 100644 Source/InventorySystem/Private/UserInterface/Actors/CharacterDisplayWidget.cpp create mode 100644 Source/InventorySystem/Public/Actors/Sword.h create mode 100644 Source/InventorySystem/Public/UserInterface/Actors/CharacterDisplayWidget.h diff --git a/.idea/.idea.InventorySystem/.idea/workspace.xml b/.idea/.idea.InventorySystem/.idea/workspace.xml index ff320e2..42bfff6 100644 --- a/.idea/.idea.InventorySystem/.idea/workspace.xml +++ b/.idea/.idea.InventorySystem/.idea/workspace.xml @@ -11,20 +11,16 @@ - - + + + + + + - - - - - - - - - - + + - - @@ -323,6 +317,13 @@ + + + + + + +