Compare commits

base: neroberovero:ef7be2cd84f93511565015152ee81d978726f72a

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

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. "ef7be2cd84f93511565015152ee81d978726f72a" and "322fbc3ade6420dcf5c14b81830c7c1f1528aae4" have entirely different histories.

ef7be2cd84 ... 322fbc3ade

343 changed files with 958 additions and 76 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/Binaries/Win64/UnrealEditor-hwanyoung2-9743.dll Normal file

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/Playables/Haesol/Animations/BP_AnimHaesolHwando.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

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/Playables/Haesol/BP_HaesolBow.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/AttributeSet/AC_AttributeSystem.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/AttributeSet/I_Buffable.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/AttributeSet/S_AttributeSetInfo.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/CombatSystem/AC_CombatSystem.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/CombatSystem/E_AttackStance.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/CombatSystem/E_BlockingState.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/AC_HPSystem.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/E_DamageReactionType.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/E_DamageType.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/I_Damagable.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/HPSystem/S_DamageInfo.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/MPSystem/AC_MPSystem.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/MPSystem/I_ManaUser.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.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/Player_HUD/WG_PlayerHUD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Pillar_50x500.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/SM_AssetPlatform.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x200.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x300.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_500x500.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Door_400x300.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Door_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Window_400x300.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Window_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire_Sparks01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light02_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Smoke01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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