Marcel Hara 688a724a62 Merge branch 'dev' into UI-Implementation ... # Conflicts: # Content/Blueprints/Player/BP_MyTempCharacter.uasset # Content/Levels/Top_layer_level.umap		2023-03-13 17:13:56 +00:00
..
Combat_UI	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
Display_UI	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
Game_UI	Updated MainWidget to fix scaling issues	2023-03-13 16:13:27 +00:00
Items	Added All Item ammo types	2023-03-13 17:00:08 +00:00
Merchant	Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine	2023-03-06 16:28:04 +00:00
Player	Bugfix Old Version of the Character with Missing References	2023-03-13 16:11:44 +00:00
Status_UI	Updated StatusSystem for Seconds Countdown	2023-02-27 03:46:06 +00:00
StatusEffects	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00
BP_HealingJellyItem.uasset	Created Inventory_UI Folder	2022-11-23 17:29:14 +00:00
BP_Interaction.uasset	Organized Content Browser	2022-11-23 17:26:35 +00:00
NotSkySphere.uasset	Added Merchant Shop assets	2023-03-06 15:31:55 +00:00