Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
e3d3061843
AzureAbyss/Content/Blueprints
History
MarcelHara e3d3061843 Merge branch 'dev' into inventory-ui-overhaul 
# Conflicts:
#	Content/Assets/Characters/Merchant/AMerchant.uasset
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Blueprints/Items/BP_BuffJelly.uasset
#	Content/Blueprints/Items/BP_HealingJelly.uasset
#	Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
#	Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
#	Content/Blueprints/Quests/Quest_SistersPendant.uasset
#	Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
#	Content/Dialogue/SM_Merchant_Blueprint.uasset
2023-05-13 17:15:48 +01:00
..
Combat_UI Merge branch 'dev' into inventory-ui-overhaul 2023-05-13 17:15:48 +01:00
Death_UI Bugfix Input Not Being Re-Enabled On Respawn 2023-03-28 05:19:41 +01:00
Display_UI Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +01:00
Game_UI Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
Inventory_UI Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
Items Merge branch 'dev' into inventory-ui-overhaul 2023-05-13 17:15:48 +01:00
MainMenu Added Credits to MainMenu and QOL changes 2023-05-11 15:14:50 +01:00
Merchant Git issues to upload part of merchant fix 2023-05-09 13:14:19 +01:00
Player Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
Quest_UI Updated UI for New Designs 2023-05-13 01:02:47 +01:00
Quests Merge branch 'dev' into inventory-ui-overhaul 2023-05-13 17:15:48 +01:00
Status_UI Bugfix Collisions, UV's & Replaced Boss with Actual Boss 2023-05-13 00:13:42 +01:00
StatusEffects Updated Status Effects to Add Damage Down for Enemy & Player 2023-05-12 20:44:46 +01: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
TalkingStalegtite_Blueprint.uasset Added talking stalegtite npc 2023-05-11 16:56:23 +01:00