Compare commits

base: neroberovero:05782979e99bb64a86e7984d553805a128103902

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:8bd822a6c6bc39c53ffa6e07fbe5d61e98706124

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. "05782979e99bb64a86e7984d553805a128103902" and "8bd822a6c6bc39c53ffa6e07fbe5d61e98706124" have entirely different histories.

05782979e9 ... 8bd822a6c6

198 changed files with 5275 additions and 8946 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/Buses/A.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Buses/Eq_HP.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/SFX/Combat/Buff_Water.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/UI/Pickup.uasset (Stored with Git LFS)

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/PrivateIntegrationData/BankLookup.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Reverbs/ArrowDrawHold.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Snapshots/ArrowDrawHold.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_NPCBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/WG_NPCHPBar.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEOverTime.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Fire.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Tea.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Meat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_MedicineBowl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_MedicinePot.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Rice.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Salt.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Sesame.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.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/0F4A25D3.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0FB823D7.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/149C3284.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/1E3951EF.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2004891E.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/201E4613.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/36DA31F4.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/3B3A2686.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/4BA9D511.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/6759C61E.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/844579F9.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/86508BF1.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8FE24A2E.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/CDFEED0D.fobj

View File

Binary file not shown.

0

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

Unescape Escape View File

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D6456ED1.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/F260DD1F.fobj

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F5E570FE.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/fsbcache/Desktop/FF85EBC7.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/{0e37adfa-589d-4463-9664-761a12aa1bf0}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{206c79e5-ec8d-4525-9313-2c48b41de8c0}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{2e604db7-d09e-4bb6-9165-22d35428ca82}.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/{32fb788c-9449-4ab8-afb8-4565e44c1877}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{35250175-caa9-4d8d-aa28-1720b27d2ff6}.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/{3e8bab76-6040-4945-a377-b7c013a04475}.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/{47959e1d-4582-4123-b548-3ac47803c174}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{493e8317-989e-4d6e-bc2c-5c3348dd64d2}.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/{63bbab8f-89ae-4070-8561-ce963b5caab0}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{7b495f40-63ad-479f-a09b-9139ad95820d}.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/{93c03764-53e6-4ec1-909e-7e40bcb9e4d2}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{9691d56c-83ea-4801-aa8f-98aa8dfb96dc}.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/{9e61281a-b5a7-4f9c-8a85-63ba09d9130e}.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.

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