Compare commits

base: neroberovero:f16aa77dd5b0774ee90e690844560fb068dff34c

Branches Tags

neroberovero:main

neroberovero:Shiori

neroberovero:fmod-co

neroberovero:Fmod-Intergration-V2

neroberovero:angela-haesol-ability

neroberovero:parry

neroberovero:reaven

neroberovero:sharon_saving_loading_3

..

compare: neroberovero:26bc8d26d11064bdaa1c2e9ab408c28fda4fc543

Branches Tags

neroberovero:Shiori

neroberovero:main

neroberovero:fmod-co

neroberovero:Fmod-Intergration-V2

neroberovero:angela-haesol-ability

neroberovero:parry

neroberovero:reaven

neroberovero:sharon_saving_loading_3

No commits in common. "f16aa77dd5b0774ee90e690844560fb068dff34c" and "26bc8d26d11064bdaa1c2e9ab408c28fda4fc543" have entirely different histories.

f16aa77dd5 ... 26bc8d26d1

56 changed files with 80 additions and 119 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/ArcherAnimationSet/DEMO/Mannequin/Character/Mesh/IKRetargeter_MannyUE4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/ArcherAnimationSet/DEMO/Mannequin/Character/Mesh/IKRig_MannyUE4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/ArcherAnimationSet/DEMO/Mannequin/Character/Mesh/UE4_Mannequin_Skeleton.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Stab1.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/Character/PlayerCharacter/SKEL_Soldier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_5.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_6.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_7.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/SaninBaseAttack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sanin_Teleport.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/water_sword_Buff_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/raon_shop.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Sanin_Teleport_End.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Maps/StarterMap.umap (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Intermediate/CachedAssetRegistry.bin

Binary file not shown.

BIN

hwanyoung2/Intermediate/ReimportCache/3688439234.bin

Binary file not shown.

3

hwanyoung2/Saved/Config/WindowsEditor/Editor.ini

File diff suppressed because one or more lines are too long