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

merge??

Browse Source
This commit is contained in:
Ji Yoon Rhee
2024-11-14 12:09:42 +09:00
parent adad96778b
commit 566b802e47
64 changed files with 3093 additions and 2409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hwanyoung2/Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini
View File

@ -249,8 +249,8 @@ AssetPropertyPicker.CurrentViewType=0
LastLevel=/Game/Hwanyoung/Levels/Spring
[ModuleFileTracking]
hwanyoung2.TimeStamp=2024.10.25-23.05.15
hwanyoung2.LastCompileMethod=Runtime
hwanyoung2.TimeStamp=2024.10.06-05.25.20
hwanyoung2.LastCompileMethod=External
StorageServerClient.TimeStamp=2024.01.31-19.18.33
StorageServerClient.LastCompileMethod=External
CookOnTheFly.TimeStamp=2024.01.31-19.18.29
@ -1269,9 +1269,9 @@ BlueprintGraph.TimeStamp=2024.01.31-19.18.29
BlueprintGraph.LastCompileMethod=External
DataTableEditor.TimeStamp=2023.10.02-22.32.40
DataTableEditor.LastCompileMethod=Unknown
FMODStudio.TimeStamp=2024.10.25-23.05.04
FMODStudio.TimeStamp=2024.10.06-04.40.41
FMODStudio.LastCompileMethod=External
FMODStudioEditor.TimeStamp=2024.10.25-23.05.04
FMODStudioEditor.TimeStamp=2024.10.06-04.40.41
FMODStudioEditor.LastCompileMethod=External
AnimationEditor.TimeStamp=2023.10.02-22.32.35
AnimationEditor.LastCompileMethod=Unknown
@ -2129,7 +2129,7 @@ bAutoExpandNodesOnSelection=True
TreeViewWidth=0.300000
[MessageLog]
LastLogListing=BlueprintLog
LastLogListing=LoadErrors
[SuppressableDialogs]
ChangeVariableType_Warning=False

3870
hwanyoung2/Saved/Logs/hwanyoung2.log
View File

File diff suppressed because one or more lines are too long

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",