Compare commits

base: neroberovero:17afa9b470c6ad10a96732c1e66dd12e1b9851aa

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

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

No commits in common. "17afa9b470c6ad10a96732c1e66dd12e1b9851aa" and "887cdf76e4efafe4fcc20ff99da3a53bed7afa44" have entirely different histories.

17afa9b470 ... 887cdf76e4

256 changed files with 269 additions and 3369 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/UI/UI_Select_3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Combo1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Jump1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Jump2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Jump3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Jump4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Slash1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Slash2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Slash3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Slash4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Slash5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Slash6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Stab1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Stab2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Stab3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Stab4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Hit/Anim_Sword_1H_Big_Hit_Front.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Hit/Anim_Sword_1H_Small_Hit_Front.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Attack_Idle1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Attack_Idle2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Laydown.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_RaiseWeapon.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Walk_Back.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Walk_Front.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Walk_Left.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Locomotion/Anim_Sword_1H_Walk_Right.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Materials/Layers/ML_Latex_Black.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Materials/Layers/ML_ShinyPlastic_Beige.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Materials/Layers/ML_ShinyPlastic_Beige_Logo.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Materials/Layers/ML_SoftMetal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Materials/M_MannequinUE4_Body.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Materials/M_MannequinUE4_ChestLogo.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Meshes/IKRig_SwordMannequin.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Meshes/SK_Mannequin_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Meshes/SK_Mannequin_Skeleton_Sword_1H.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Meshes/SK_Mannequin_Sword_1H.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_ML_Aluminum01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_ML_Aluminum01_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_ML_Rubber_Blue_01_D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_ML_Rubber_Blue_01_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_UE4_Mannequin_MAT_MASKA.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_UE4_Mannequin__normals.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_UELogo_Mask.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Demo/Characters/Mannequin_UE4/Textures/T_UELogo_N_TGA.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Weapon/M_Sword.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/HandsomeSwordCombatAnims/Weapon/SM_CombatSword.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_WaitForPuzzleEnd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/body.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/StandingMeleeAttackDownward_2__UE.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/StandingMeleeAttackDownward_2__UE_Montage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IKRetargeter_Soldier.uasset (Stored with Git LFS) Normal file

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/TutorialSystem/BP_TutorialShowActor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/TutorialSystem/DT_TutorialText.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/TutorialSystem/S_TutorialText.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_CookingCauldron.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/Interactables/BP_GameInstance.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

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