Merge branch 'main' into Chaz

This commit is contained in:
Hozach (Audio) 2025-05-09 11:23:07 -04:00
commit 8dc1d992e2
121 changed files with 721 additions and 123 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
hwanyoung2/Content/Illusions/.cache/\{d547300b-f688-4816-b2a8-0edd5f5e77a1\}.pdc

View File

@ -2,6 +2,7 @@
GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
EditorStartupMap=/Game/Hwanyoung/Levels/Spring-Sharon.Spring-Sharon
GlobalDefaultGameMode=/Script/hwanyoung2.hwanyoung2GameMode
GameInstanceClass=/Game/Hwanyoung/Interactables/BP_GameInstance.BP_GameInstance_C
[/Script/Engine.RendererSettings]
r.Mobile.ShadingPath=0

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/S_Lore.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More