MarcelHara bef17b7f04 Merge branch 'volumetric-fog' into dev ...

# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Levels/Build.umap

2023-04-30 13:06:51 +01:00

..

Combat_UI

Merge branch 'volumetric-fog' into dev

2023-04-30 13:06:51 +01:00

Death_UI

Bugfix Input Not Being Re-Enabled On Respawn

2023-03-28 05:19:41 +01:00

Display_UI

Attempted fix widget to merchant system

2023-03-14 13:04:33 +00:00

Game_UI

Added Volumetric fog and fine tuned

2023-04-27 17:19:16 +01:00

Inventory_UI

Bugfix New UI Not Displaying

2023-03-13 18:10:02 +00:00

Items

Updated Positions of Items to Merchant Shop

2023-03-16 17:18:01 +00:00

MainMenu

Changed UI to 2D to make it look 3D on the book

2023-04-27 17:18:46 +01:00

Merchant

Bugfix Merchant Unable to Purchase Items

2023-03-28 03:43:31 +01:00

Player

Added TutorialText to game

2023-04-17 17:33:40 +01:00

Quest_UI

Updated Quest UI to Display Tasks

2023-03-13 18:11:42 +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