PHILIP White e8c20e2d67 Merge branch 'dev' into Turn-Based-Combat ... # Conflicts: # Content/Blueprints/Combat_UI/CombatCharacter.uasset # Content/BungeeMan/Mat_BungeeMan_Rubber.uasset # Content/Dialogue/NPCTest.uasset # Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp		2023-02-28 15:29:35 +00:00
..
Combat_UI	Updated TurnBasedCombat to Include New Combos	2023-02-27 04:07:19 +00:00
Display_UI	Changed BP_GoldCount to BP_ImportantStats	2023-01-14 22:11:15 +00:00
Inventory_UI	Added InventoryImage to Inventory UI	2023-02-27 17:45:58 +00:00
Items	Added BP_AmmoItem	2023-02-07 00:11:19 +00:00
Merchant	Updated Widgets to fix scaling issue	2023-02-20 16:03:25 +00:00
Player	Updated TempCharacter to remove unused Ulogs	2023-02-23 15:19:32 +00:00
Status_UI	Updated StatusSystem for Seconds Countdown	2023-02-27 03:46:06 +00:00
StatusEffects	Added Thorns Status Effect for Combat	2023-02-27 04:55:12 +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