neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto stash before merge of "main" and "origin/main"

Browse Source
This commit is contained in:
benroshio
2024-11-08 00:45:36 -05:00
parent 503d43a479
commit a2fa5352ca
40 changed files with 6235 additions and 2091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hwanyoung2/Saved/SourceControl/UncontrolledChangelists.json
View File

@ -37,7 +37,6 @@
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/Music/Haesol.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Snapshots/Music_Under_UI.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Reverbs/Music_Under_UI.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Buses/A.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/UI_Select.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Buses/Reverb.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Buses/Music.uasset",
@ -58,12 +57,10 @@
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Reverbs/Music_Normal.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/Journal_Close.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/UI_Hover_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/WS/KJ15Q25M2WE8DXVHDOX3NY.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/Music/Ambience.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Buses/Ambience.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Haesol_finished_prob.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/sword_2.uasset",
@ -93,16 +90,33 @@
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_2.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_sheathe.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/Combat/Arrow_Impact_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Haesol_cello_finale_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/Menu_open.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/FMOD_illusions/Assets/close_bag_master_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/FMOD_illusions/Assets/open_bag_master_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/Menu_open_2.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/Menu_Close.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/Combat/Dash.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/WHITE_RISER.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/save.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/Crafting.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/Music/Battle_Spring.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/UI/Save.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/ExplosionBlast_S08WA_111.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Spring_Combat_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/bow_string.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Buff_Haesol.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Creak_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Creak_2.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Sword_block_2.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail_version_4.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail3.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/UI/crafting_smol.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Buses/A.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/WS/KJ15Q25M2WE8DXVHDOX3NY.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Haesol_cello_finale_1.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/dash.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/Illusions/Assets/Haesol_finished_prob.uasset",
"C:/Users/benja/Desktop/Halloween JAm/Illusions/Illusion-UE5/hwanyoung2/Content/FMOD/Events/SFX/UI/UI_open.uasset",