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
..
DialogueTest.umap	Updated DialogueNPC to use Ranged For Loops	2023-02-20 09:50:09 +00:00
NPCTest.uasset	Bugfix Expiry Timers Not Getting Invalidated	2023-02-25 01:25:32 +00:00
TextPrompt.uasset	Updated TextPrompt for Choices	2023-02-06 03:27:49 +00:00