Merge pull request #12 from Games-Academy-Student-Work-22-23/UI-Implementation

UI implementation
2023-03-13 17:14:10 +00:00 · 2023-03-13 17:14:10 +00:00 · 56db7d3e9c
commit 56db7d3e9c
parent f82e8a892e 688a724a62
20 changed files with 53 additions and 6 deletions
--- a/Content/Blueprints/Game_UI/InventoryIcons/Beastiary_Symbol.uasset
+++ b/Content/Blueprints/Game_UI/InventoryIcons/Beastiary_Symbol.uasset
--- a/Content/Blueprints/Game_UI/InventoryIcons/Combos_Symbol.uasset
+++ b/Content/Blueprints/Game_UI/InventoryIcons/Combos_Symbol.uasset
--- a/Content/Blueprints/Game_UI/InventoryIcons/Gear_Symbol.uasset
+++ b/Content/Blueprints/Game_UI/InventoryIcons/Gear_Symbol.uasset
--- a/Content/Blueprints/Game_UI/InventoryIcons/Inventory_Symbol.uasset
+++ b/Content/Blueprints/Game_UI/InventoryIcons/Inventory_Symbol.uasset
--- a/Content/Blueprints/Game_UI/InventoryIcons/Map_Symbol.uasset
+++ b/Content/Blueprints/Game_UI/InventoryIcons/Map_Symbol.uasset
--- a/Content/Blueprints/Game_UI/InventoryIcons/Settings_Symbol.uasset
+++ b/Content/Blueprints/Game_UI/InventoryIcons/Settings_Symbol.uasset
--- a/Content/Blueprints/Game_UI/WBP_Combos.uasset
+++ b/Content/Blueprints/Game_UI/WBP_Combos.uasset
--- a/Content/Blueprints/Game_UI/WBP_Gear.uasset
+++ b/Content/Blueprints/Game_UI/WBP_Gear.uasset
--- a/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset
+++ b/Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset
--- a/Content/Blueprints/Game_UI/WBP_Lore.uasset
+++ b/Content/Blueprints/Game_UI/WBP_Lore.uasset
--- a/Content/Blueprints/Game_UI/WBP_MainWidg.uasset
+++ b/Content/Blueprints/Game_UI/WBP_MainWidg.uasset
--- a/Content/Blueprints/Game_UI/WBP_Maps.uasset
+++ b/Content/Blueprints/Game_UI/WBP_Maps.uasset
--- a/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset
+++ b/Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset
--- a/Content/Blueprints/Game_UI/WBP_Settings.uasset
+++ b/Content/Blueprints/Game_UI/WBP_Settings.uasset
--- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset
+++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset
--- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset
+++ b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset
--- a/Content/Fonts/Adistro-8MePB.otf
+++ b/Content/Fonts/Adistro-8MePB.otf
--- a/Content/Fonts/Adistro-Font.uasset
+++ b/Content/Fonts/Adistro-Font.uasset
--- a/Content/Fonts/Adistro_Font.uasset
+++ b/Content/Fonts/Adistro_Font.uasset
--- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h
+++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h
@ -102,4 +102,6 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
 	UUserWidget* ImportantStats;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
 	UUserWidget* MainMenuWidget;
 };