Commit merge main into my branch!

Merge branch 'main' into Chaz
complete merge
2025-05-02 20:19:01 -04:00 · 2025-05-02 20:18:32 -04:00 · 2025-05-03 08:52:55 +09:00 · 2025-05-01 23:50:59 +09:00
7 changed files with 12 additions and 12 deletions
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Sanin.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Sanin.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SaninController.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SaninController.uasset
--- a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin
+++ b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin
Author	SHA1	Message	Date
Hozach (Audio)	5d9b550d18	Commit merge main into my branch!	2025-05-02 20:19:01 -04:00
Hozach (Audio)	eecffe8dca	Merge branch 'main' into Chaz	2025-05-02 20:18:32 -04:00
Ji Yoon Rhee	d0980840ad	complete merge	2025-05-03 08:52:55 +09:00
Ji Yoon Rhee	8b76377bb4	added the nav mesh for bunny AI + incorporated dialogues into bunny NPC	2025-05-01 23:50:59 +09:00