Compare commits

base: neroberovero:d5df6435777e0463a3cdc7febfdccfa22ec2e4ec

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

No commits in common. "d5df6435777e0463a3cdc7febfdccfa22ec2e4ec" and "2d873057cf341d39345c92b2c2bf3343ac9d3cff" have entirely different histories.

d5df643577 ... 2d873057cf

1646 changed files with 2670 additions and 6142 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/Characters/Mannequins/Animations/ABP_Manny.uasset

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/BP_HYPlayerCharacController.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/HY_DefaultInputContext.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/InputActions/IA_Interact.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/InputActions/IA_ToggleInventory.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/InputActions/IA_UseAbility1.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_HYController.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_Haesol.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_HaesolAttribute.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_HaesolInitGameplayEffectLevel1.uasset Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.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/Input/InputActions/IA_BlockAttack.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_DefaultAttack.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Interact.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_ToggleInventory.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseAbility1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseAbility2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseAbility3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseInventoryItem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseUltimate.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Walk.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_WalkChord.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_ProjectileInputContext.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_body_mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_gold_mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_nock_mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_string_mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/GochugaruSurface1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/GochugaruSurface2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Meat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Salt.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Sesame.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/gochugaru.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_pot.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/I_ManaUser.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)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Maps/Preview_Bottom.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Maps/Preview_Fly.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_6.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_6.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_6.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_5.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_6.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

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