Commit Graph

10 Commits

Author SHA1 Message Date
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
2f47693608 Bugfix Expiry Timers Not Getting Invalidated 2023-02-25 01:25:32 +00:00
26f21a9136 Updated DialogueNPC to use Ranged For Loops 2023-02-20 09:50:09 +00:00
d1fab9f9a1 Updated DialogueNPC for Structs and Dialogue Paths 2023-02-09 03:12:27 +00:00
7f3e3cbb52 Updated DialogueNPC to Add Dialogue via Blueprints 2023-02-06 03:28:53 +00:00
e5b624411d Updated TextPrompt for Choices 2023-02-06 03:27:49 +00:00
acefce8bbc Added InteractNPC to Line Trace for Interact 2023-02-02 03:15:50 +00:00
3433254463 Added DialogueNPC Actor Component with Text Animation 2023-02-02 01:59:33 +00:00
5988272890 Added Base Text Prompt Widget Blueprint 2023-02-01 23:47:59 +00:00
42ce95b84e Added Dialogue Testing Map with Temp NPC 2023-02-01 23:47:22 +00:00