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

Compare commits

base: neroberovero:2d873057cf341d39345c92b2c2bf3343ac9d3cff
Branches Tags
neroberovero:main
neroberovero:fmod-integration
neroberovero:sharon_saving_loading_3
neroberovero:sharon_saving_loading_2
neroberovero:sharon_saving_loading
neroberovero:angela-inventory
neroberovero:origin/ken-movement
neroberovero:pan-branch
..
compare: neroberovero:664e26d7869f0ce06fb683b1d27ad65b65288f1e
Branches Tags
neroberovero:main
neroberovero:fmod-integration
neroberovero:sharon_saving_loading_3
neroberovero:sharon_saving_loading_2
neroberovero:sharon_saving_loading
neroberovero:angela-inventory
neroberovero:origin/ken-movement
neroberovero:pan-branch

No commits in common. "2d873057cf341d39345c92b2c2bf3343ac9d3cff" and "664e26d7869f0ce06fb683b1d27ad65b65288f1e" have entirely different histories.
2d873057cf ... 664e26d786

204 changed files with 31585 additions and 15791 deletions
Show Stats Expand all files Collapse all files

BIN
hwanyoung2/Content/FMOD/Buses/A.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Buses/Ambience.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Buses/SFX_Combat.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Desktop/Master.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Desktop/Master.strings.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/Music/Ambience.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Arrow_Impact_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Arrow_Release_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Bow_draw_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Bow_equip.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Tk_Block_Impact.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Tk_Block_Ready.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/parry.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_4.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_block.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_draw.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/sword_sheathe.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/water_arrow_sounds_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/water_reload.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/Menu_open.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/UI_Close.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/UI_open.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Reverbs/CombatSFX.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Snapshots/CombatSFX.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/06B87BAF.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/096B525D.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1AF106A3.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2881015A.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/28B7D62D.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/34D03CE4.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/37437A1C.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3B6DFBE6.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/440B76EC.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/52FABF29.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5602122D.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/579E86B8.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/58990BAE.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/617C66D5.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A14AAF50.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/AF54786B.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/C3DFB20F.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D3A4D7C2.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D80849B6.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F15CFBFD.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FB0F4352.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{097fe95c-fbd5-4a8c-8be8-7c452d9fc2fc}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{0a3f3d95-007f-4808-83ee-7fd732941ec0}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{30b14116-1f37-44dd-b072-d31963ed1eed}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{31437fc8-7765-4622-a0a9-08faa249a083}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{366c9ccd-d27d-4b41-8ccf-79d7456c803d}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{3a0897f4-a788-4455-9058-8c78a5561c80}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{40d46784-a42e-4a3a-88ab-a45f836f675a}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{51361f47-1071-42dd-9436-2338965081ac}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{8e048db8-e707-4f0e-bf23-3e587af8923a}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{9aa67dc2-70b1-4a70-a4af-1d1e95d8332b}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{b8e21bc7-d616-4b96-92c6-a530ba132823}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{b960fcfb-213c-401d-8405-4938933d5731}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{b987dc57-a718-4556-a1f8-79f606a0b33e}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{d29c51b2-d6ae-457d-a606-c327b625234b}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{d4c1f2eb-b149-44e3-b36b-51e50a9b55f6}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{dbdf0633-d22b-4d14-a967-34499bb707bf}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{e0d2d86f-3ebd-4d9c-a3e6-6d295e358587}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{e179ef98-764a-481e-a25e-a04e091a27b7}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{efa740e5-6b1c-4323-9d23-602cbfb915e7}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{f43340c1-4fe1-4ded-a92e-ef503792b06e}.pdc
View File

Binary file not shown.

3
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
View File

@ -10,11 +10,10 @@
</object>
<object class="ProjectSettings" id="{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}">
<property name="openWindows">
<value>Mixer 1</value>
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAABAAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAAAAAuMAAAG2AAAHcgAABZUAAALkAAAB1QAAB3EAAAWUAAAAAAAAAAAKAAAAAuQAAAHVAAAHcQAABZQAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAABrwAAABcAAAY8AAAD1gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADIAAABCAdnQywADAAAAAAMZAAAA+wAABzoAAAOsAAADGgAAARoAAAc5AAADqwAAAAAAAAAACgAAAAMaAAABGgAABzkAAAOrAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACzAAAAcAAAAbrAAAErgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3</value>
<value>AAAAAgAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAAA68AAADvAAAIPgAABM4AAAOwAAABDgAACD0AAATNAAAAAAAAAAAKAAAAA7AAAAEOAAAIPQAABM0AAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAFVAAAAFgAABXQAAAKnAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXc=</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

3
hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml
View File

@ -10,11 +10,10 @@
</object>
<object class="ProjectSettings" id="{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}">
<property name="openWindows">
<value>Mixer 1</value>
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAABAAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAAAAAuMAAAG2AAAHcgAABZUAAALkAAAB1QAAB3EAAAWUAAAAAAAAAAAKAAAAAuQAAAHVAAAHcQAABZQAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAABrwAAABcAAAY8AAAD1gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADIAAABCAdnQywADAAAAAAMZAAAA+wAABzoAAAOsAAADGgAAARoAAAc5AAADqwAAAAAAAAAACgAAAAMaAAABGgAABzkAAAOrAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACzAAAAcAAAAbrAAAErgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3</value>
<value>AAAAAgAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAAA68AAADvAAAIPgAABM4AAAOwAAABDgAACD0AAATNAAAAAAAAAAAKAAAAA7AAAAEOAAAIPQAABM0AAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAFVAAAAFgAABXQAAAKnAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXc=</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Haesol_finished_prob.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Sword block.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Sword_block.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Tk Block Impact.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Tk Block Ready.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Tk_Block_Impact.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/Tk_Block_Ready.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/swor sheathe.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/swor_sheathe.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword 1.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword 2.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword 3.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword 4.wav (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword_2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword_3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sword_4.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Haesol cello finale 1.wav (Stored with Git LFS)
View File

Binary file not shown.

0
hwanyoung2/Content/Illusions/Assets/Combat/Haesol finished prob.wav → hwanyoung2/Content/Illusions/Assets/Haesol finished prob.wav
View File

BIN
hwanyoung2/Content/Illusions/Assets/Haesol_cello_finale_1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Haesol_finished_prob.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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