Compare commits

base: neroberovero:f3c2b4802c7b253593fbbb57b58e1745fc612d39

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

...

compare: neroberovero:f809686a566f7a4b01d2f73086066540db08fb4d

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

23 Commits

f3c2b4802c ... f809686a56

Author	SHA1	Message	Date
benroshio	f809686a56	I need to go to bed commit	2025-04-24 01:47:19 -04:00
benroshio	d95d5284a6	Merge branch 'Shiori'	2025-04-24 01:16:46 -04:00
benroshio	d54a2187d2	Assets re added	2025-04-22 13:37:25 -04:00
benroshio	dafcf19ad4	push before merge	2025-04-22 13:27:33 -04:00
benroshio	8a16a189df	Footsteps implemented + Menu And Arrow sfx bug fixes	2025-04-18 19:03:20 -04:00
benroshio	684769903a	Merge branch 'main' into Shiori	2025-04-16 12:37:20 -04:00
benroshio	cee542b25b	Merge remote-tracking branch 'origin/main'	2025-04-16 12:35:46 -04:00
benroshio	e7c2adfd89	Merge branch 'Fmod-Intergration-V2' into Shiori	2025-04-16 12:35:08 -04:00
benroshio	6dfcbdfd48	Missing Sfx Fix	2025-04-16 12:25:39 -04:00
benroshio	c2c29e303f	Merge branch 'fmod-co' into Fmod-Intergration-V2	2025-04-12 14:05:17 -04:00
benroshio	feb0fee599	merge	2025-04-12 14:02:21 -04:00
benroshio	701d9bcb05	Merge branch 'fmod-co' into Shiori	2025-04-12 13:52:49 -04:00
benroshio	e25825931c	Sanin timing fix	2025-04-12 13:47:37 -04:00
benroshio	6d57eb432d	Fmod bank refresh	2025-04-11 11:35:03 -04:00
benroshio	552b32ed56	Merge branch 'Shiori' into Fmod-Intergration-V2	2025-04-11 11:31:27 -04:00
benroshio	640f6b5db5	Merge remote-tracking branch 'origin/main'	2025-04-11 11:28:43 -04:00
benroshio	20f6849d90	Merge remote-tracking branch 'origin/main'	2025-04-07 23:19:03 -04:00
benroshio	5987dbc276	Merge branch 'main' into Shiori	2025-04-07 23:04:35 -04:00
benroshio	28dcf82cca	Auto stash before merge of "Shiori" and "main"	2025-04-07 23:04:18 -04:00
benroshio	08606779a8	Merge remote-tracking branch 'origin/main'	2025-04-07 20:18:46 -04:00
hozach	499fc3ae18	Footsteps - Grass - Boots	2025-04-04 18:35:16 -04:00
hozach	74e1948c35	Rock Teleport for Sanin	2025-04-04 18:28:24 -04:00
benroshio	5c975ddaa9	Arrow ult sound fix ... added to bp_haesol	2025-03-26 23:23:02 -04:00

564 changed files with 5165 additions and 95 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

hwanyoung2/Content/FMOD/Desktop/Master.bank

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Desktop/Master.strings.bank

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Loop_Sweetener.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Appear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Appear_Disappear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Disappear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_Start_-_Oneshot.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Dirt_Walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Grass_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Grass_walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Stone_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/ABP_Haesol1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/AS_Bow_InPlace_Run_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/AS_Bow_InPlace_Walk_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Hwando_Run_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Walk_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Walk_InPlace.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliaged_Ground_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/IdaFaber/Demo/Animations/Boy/AS_UE5_MM_Jump.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/IdaFaber/Demo/Animations/Boy/AS_UE5_MM_Land.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/067D291C.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1883A555.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B15B64E.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1CA6CC10.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/20D9487C.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/24CD2F65.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2BE87DD4.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2CBF1416.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2D43A925.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2DE6E3A9.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3E01747B.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3EBE7637.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/457A1354.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/46CD53C6.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4A856CF6.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5033A088.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/528EAB1B.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/60C6A5A7.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/61BF9D54.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6FCF773F.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/71B27784.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/74F9F1FD.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7BC3CDFF.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7BE1D0E5.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/88B3B2EE.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/953EEBCA.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9D83D5B3.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A133E8F8.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/ABF67778.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/AE1A79F6.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B59CCC19.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B68869C2.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B7C5FC58.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CD803ABE.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CE20219F.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D65E81C8.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E5EFEB1A.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E69665D7.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E6CEC951.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/EF371689.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F6958427.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F697AA2E.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FB6FA391.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{010333e7-6a3f-419f-9308-6f2bf901f6f2}.pdc Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{0bbb457e-d56a-416c-be6b-d409dd3caa27}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{1f0e974e-08c5-401d-90b8-eda9ad9b0d27}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{22e7f674-6e11-4c64-9219-cf1dc717edfa}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{330299d0-ce39-4d85-9794-ee8fba381f89}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{35250175-caa9-4d8d-aa28-1720b27d2ff6}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{36354e40-3dbe-4f55-89f5-e0d93dc1fcf6}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{3896e310-298f-4517-9f89-0ddda1bf8d7d}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{43a3738c-0acc-4951-a6dc-67681b238fc4}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{482da77a-16f2-47cd-8665-a619232b7ec9}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{48a28a69-d816-4167-96c5-7c406f0e2f9a}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{48c87c51-21c9-4e8f-a24d-c4f0421501cf}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{560e5048-fa34-470c-a547-e017b5f3befd}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{566d8252-d52c-4952-8a42-2269ef79d35c}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{57a5b0d0-20af-4bbd-a58c-984dbb691d6c}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{5ad1240c-8a3c-4af7-ad33-dbf9f0ef47f2}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{66e5059c-95c6-4cb7-a8e2-19707c561d50}.pdc Normal file

Binary file not shown.

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