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

Compare commits

merge into: neroberovero:main
Branches Tags
neroberovero:main
neroberovero:Chaz
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3
...
pull from: neroberovero:Chaz
Branches Tags
neroberovero:Chaz
neroberovero:main
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3

9 Commits
main ... Chaz

Author SHA1 Message Date
Hozach (Audio)
8dc1d992e2 Merge branch 'main' into Chaz 2025-05-09 11:23:07 -04:00
Hozach (Audio)
ebc53ac266 Merge branch 'main' into Chaz 2025-05-03 10:31:15 -04:00
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
Hozach (Audio)
113523b8a6 Committing Added Assets (bunny and fem vox and spring song) 
Also recommitting changes to uproject (animations don't save without added metadate I think)

Also omitting this from commit (changes are trying to delete this file):
F:\SAM SSD (iMac SSD2)\Git\Illusion-UE5\hwanyoung2\Content\Illusions\.unsaved\dragon ult uncut.ogg

Seems important?
 2025-05-02 16:08:55 -04:00
Hozach (Audio)
b0a7367b7a Committing animation SFX FMOD asset and implementation into Sanin animation 2025-05-02 14:59:27 -04:00
benroshio
f2f8d3ec42 Update from main merge 2025-05-02 14:03:51 -04:00
benroshio
3ce7aa9c2c Merge branch 'main' into Shiori 2025-05-02 14:03:05 -04:00
benroshio
9e58fbdc7c Merge branch 'main' into Shiori 2025-04-25 20:50:07 -04:00
228 changed files with 1366 additions and 372 deletions
Show Stats Expand all files Collapse all files

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

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_Start.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/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Montages/06_chanting_all.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/036C33C6.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/05763C6C.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0654A731.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/092EB8F2.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0A5C20C4.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/123C8F8C.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/12908395.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/13170170.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/13750559.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/13B67EE7.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/150CE2AC.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/19737346.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/206E462B.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2227A44C.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/227E1949.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/240F470F.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/25FD0800.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/28C9B91B.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2BEC3A2A.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2CFB274D.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/31BB9052.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3458A20C.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3C0632D3.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3E89709E.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/469CC50F.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/48DE70E0.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4A8ACE86.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4AC84B53.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4E138160.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/53C34C25.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/57A04E7B.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/57A9342E.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/57E00461.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5E49DA12.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/64327584.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/644F5A1B.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/66BF64D2.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6B5C432A.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6CA76407.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6CCCFBC4.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6D96A3DA.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6E05E8BC.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6E71068B.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6EC0C432.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/73E4FF22.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/74E9CC01.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/77BAA603.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7A251656.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7E2A4E54.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7EA0BBF4.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/820F3C3E.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8427BD24.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/842DCAFA.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/85AA74B3.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/86F8C0E2.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/87D088E0.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8D3885F3.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8E2E3984.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8E91F7E2.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9595FA32.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9819FB51.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/985B98A7.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9B4C3231.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A24505D2.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A3C192C5.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A4C4BA29.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A60A0DC3.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B074BE54.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B1C5F3D6.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B407C279.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B59B969E.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/C42D27B0.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/C7CF280A.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/C7F43DC9.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CA49B649.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CD392DFA.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CF258A48.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D0138850.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D4EEB5E6.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/DA66590F.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/DB0D3BC3.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E161176F.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E33F9081.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E464C9BD.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E981568A.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/ECB36508.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/EDEEB177.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F1C46C76.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F2CE021D.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F33367EF.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F37BCC7C.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F437CB53.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F6419F25.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FD00AC7A.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FDDC06FB.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{0299c0e1-928b-4df7-b7f9-90f8327a528d}.pdc
View File

Binary file not shown.

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