Compare commits

base: neroberovero:c5f825f16d900c479defcedff40a8219a09cdb37

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

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

3 Commits

c5f825f16d ... 4e5f371b49

Author	SHA1	Message	Date
Ji Yoon Rhee	4e5f371b49	add blueprints for HP system, assets, and MP system	2024-06-01 09:30:13 +09:00
Ji Yoon Rhee	c03b8968e1	deleted off unnecessary, conflicting files in our solution file	2024-06-01 09:29:00 +09:00
Ji Yoon Rhee	87c47a72e3	commit	2024-05-25 08:07:59 +09:00

612 changed files with 3050 additions and 2011 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/Hwanyoung/Character/BP_HYPlayerCharacController.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/HY_DefaultInputContext.uasset

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack1_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack1_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack2_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack2_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack3_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack3_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack4_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Attack4_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Damage_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Damage_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Defense_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Defense_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Die_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Die_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Idle1_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Idle1_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Idle2_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Idle2_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Run_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Run_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_WalkBack_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_WalkBack_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_WalkLeft_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_WalkLeft_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_WalkRight_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_WalkRight_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Walk_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Dangpa/Anim_Dangpa_Walk_Weapon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack1_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack1_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack1_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack2_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack2_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack2_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack3_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack3_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack3_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack4_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack4_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Attack4_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Damage_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Damage_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Damage_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Defense_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Defense_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Defense_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Die_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Die_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Die_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Idle1_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Idle1_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Idle1_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Idle2_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Idle2_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Idle2_Sword.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Run_Shield.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Deoungpae/Anim_Deoungpae_Run_Soldier.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

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