Compare commits

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

..

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

16 Commits

2d873057cf ... d5df643577

Author	SHA1	Message	Date
benroshio	d5df643577	Merge remote-tracking branch 'origin/main' into fmod-integration	2024-06-11 16:07:25 -04:00
Ji Yoon Rhee	18abbad56d	changed some input-related code in player charac controller	2024-06-11 21:53:04 +09:00
Ji Yoon Rhee	917a1bb668	can toggle up inventory UI, can't tell if the input bindings for using item from inventory overlaps with that for normal melee attack	2024-06-11 21:52:34 +09:00
Ji Yoon Rhee	68d9fafdf6	added input action reference for walking, binded IA_Walk to Move() function	2024-06-10 18:41:00 +09:00
Ji Yoon Rhee	06bb51a198	binded input actions for walking and jogging for haesol	2024-06-10 18:40:12 +09:00
benroshio	d4fbc87b5a	Merge remote-tracking branch 'origin/main' into fmod-integration	2024-06-09 16:20:22 -04:00
Ji Yoon Rhee	264db39cc1	included the input mapping contexts to character.cpp and playercharaccontroller.cpp. need to replace the interact to character	2024-06-09 22:25:09 +09:00
Ji Yoon Rhee	c956bf2978	added death event, stance variable to character blueprint	2024-06-09 22:23:51 +09:00
Ji Yoon Rhee	1b515981f5	created input mapping context for projectile attacks and UI toggling	2024-06-08 23:27:33 +09:00
Ji Yoon Rhee	d51ec24938	set up input mapping in hwanyoung2 character	2024-06-08 23:26:38 +09:00
Ji Yoon Rhee	cf35258254	added anim bp and base character bp	2024-06-08 08:25:27 +09:00
benroshio	5249fa75b6	Merge remote-tracking branch 'origin/main' into fmod-integration	2024-06-05 11:58:43 -04:00
Ji Yoon Rhee	d69e46553f	visual effect assets	2024-06-01 12:49:36 +09:00
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

1646 changed files with 6151 additions and 2679 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)

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/Input/InputActions/IA_BlockAttack.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_string_mat.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/Material/standardSurface1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface8.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/bow_test_v1.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/GeneralizedBlueprints/AC_CombatSystem.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/BP_ManualPickUpItemBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/E_AttackStance.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/ItemBP/BP_FoxMarble.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.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_InventoryHUDWidget.uasset (Stored with Git LFS)

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/KTP_Effect/Maps/Preview_Bottom.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_1.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