Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
AzureAbyss/Content/Blueprints/Combat_UI
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
..
Gun
Updated MainMenu Scene to have a background
2023-04-30 15:14:59 +01:00
Iconage
Added Healing Jelly Button in Combat Widget
2023-05-09 00:42:56 +01:00
Battle_paper.uasset
Updated UI for New Designs
2023-05-13 01:02:47 +01:00
BookCombat_UI.uasset
Updated Item Icons for Buff and Healing Jellies
2023-05-13 16:55:49 +01:00
BookWorldWidget.uasset
Updated Boss for Dialogue and End Game Dialogue
2023-05-13 16:25:07 +01:00
BP_TurnBaseCombatV2.uasset
Changed player maximum ammo
2023-05-12 16:36:14 +01:00
CMS_Shoot.uasset
Updated Combat to Include Camera Shake on Shoot & Wall Break
2023-04-27 05:13:41 +01:00
CMS_WallBreak.uasset
Updated Combat to Include Camera Shake on Shoot & Wall Break
2023-04-27 05:13:41 +01:00
Combat_Test.uasset
Added Prototype Gun to Player Character
2022-11-14 23:05:35 +00:00
Combat_UI_RT.uasset
Updated TurnBaseCombat for Keyboard Hotkeys
2022-11-24 02:49:37 +00:00
Combat_UI.uasset
Updated UI for New Designs
2023-05-13 01:02:47 +01:00
CombatCharacter.uasset
Changed Item tooltips to look better and overhauled item logic
2023-05-13 17:10:36 +01:00
CombatCharacterRT.uasset
Updated TurnBaseCombat for Keyboard Hotkeys
2022-11-24 02:49:37 +00:00
CombatInit.uasset
Updated Combat to Include a Reload Effect
2023-04-26 02:10:01 +01:00
CombatTutorial.uasset
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +01:00
Empty.uasset
Added Healing Jelly Button in Combat Widget
2023-05-09 00:42:56 +01:00
EndDialogue.uasset
Updated Boss for Dialogue and End Game Dialogue
2023-05-13 16:25:07 +01:00
Enemy_UI.uasset
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +01:00
FlashLightTutorial.uasset
Added TutorialText to game
2023-04-17 17:33:40 +01:00
Health_bar_empty.uasset
Added combat and material bars
2023-03-29 15:48:08 +01:00
Health_bar_full.uasset
Added combat and material bars
2023-03-29 15:48:08 +01:00
material_empty.uasset
Added combat and material bars
2023-03-29 15:48:08 +01:00
material_full.uasset
Added combat and material bars
2023-03-29 15:48:08 +01:00
MicrosoftTeams-image.uasset
Added UI elements and collisions
2023-04-20 16:46:27 +01:00
NS_GunEffect.uasset
Updated GunEffect to fix sparks not feeling realistic
2023-05-04 13:41:18 +01:00
RealTimeCombatTest.uasset
Updated TurnBaseCombat for Keyboard Hotkeys
2022-11-24 02:49:37 +00:00
RedVignette_Inst.uasset
Updated Combat to Include Red Vignette on Damage Taken
2023-04-27 06:59:52 +01:00
RedVignette.uasset
Updated Combat to Include Red Vignette on Damage Taken
2023-04-27 06:59:52 +01:00
RenderOver.uasset
Bugfix Camera Clipping and Render Depth On Book & Gun
2023-04-27 03:47:24 +01:00
Resource_Fill.uasset
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
Resource_Outline.uasset
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
TestEnemy.uasset
Added Prototype Gun to Player Character
2022-11-14 23:05:35 +00:00
TutorialArrow.uasset
Added Tutorial Widget with Functionality
2023-04-24 11:54:28 +01:00
TutorialRippedPaperNew.uasset
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +01:00
Widget3DPassThrough_Inst.uasset
Added Combat UI Asset for World Space
2023-04-21 02:57:18 +01:00
Widget3DPassThrough.uasset
Bugfix Camera Clipping and Render Depth On Book & Gun
2023-04-27 03:47:24 +01:00