Compare commits

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

...

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

24 Commits

887cdf76e4 ... 17afa9b470

Author	SHA1	Message	Date
Ji Yoon Rhee	17afa9b470	added the stagger anim montage as variable	2025-05-13 22:39:28 +09:00
Ji Yoon Rhee	be5b88d38c	added cooking SFX to cooking HUD widget	2025-05-13 22:38:55 +09:00
Ji Yoon Rhee	ecbb987836	added the player start in the tutorial cave	2025-05-13 22:38:31 +09:00
Ji Yoon Rhee	4330a2b1a0	FINALLY DOKKAEBI RELATED FILES ARE UPLOADING	2025-05-13 22:37:50 +09:00
Ji Yoon Rhee	e84a0bd09c	dokkaebi skeletal mesh	2025-05-13 22:28:18 +09:00
Ji Yoon Rhee	6b0ac6a201	dokkaebi materials please work please please	2025-05-13 22:25:14 +09:00
Ji Yoon Rhee	c4c90be427	deleted some stuff related to dokkaebi 2	2025-05-13 22:24:09 +09:00
Ji Yoon Rhee	8b99f46832	deleted some stuff related to dokkaebi	2025-05-13 22:22:34 +09:00
Ji Yoon Rhee	59f0d04da9	overwrite haesol	2025-05-13 21:29:19 +09:00
7heIVIaze	49e26b489b	Merge	2025-05-13 17:50:43 +09:00
7heIVIaze	2420a2baa2	Created Tutorial Widget and Tutorial Text ... Tutorial Widget, Tutorial Text Data Table, Images for tutorial, and created logic for tutorials	2025-05-13 17:49:52 +09:00
Ji Yoon Rhee	6cf991b47c	NPC changes	2025-05-13 16:09:19 +09:00
Ji Yoon Rhee	c3395a1bac	fixed the dialogue audio bug, now can play the dialogue melodic lines	2025-05-13 15:58:39 +09:00
Ji Yoon Rhee	d0818c4c80	merged changes for HUDs from reaven	2025-05-13 15:07:48 +09:00
Ji Yoon Rhee	5402fbc023	bank built from SFX designers	2025-05-13 15:07:12 +09:00
Ji Yoon Rhee	057ae35081	merge for SFXs (for like the nth time)	2025-05-13 15:06:32 +09:00
Ji Yoon Rhee	82b9ff8ff0	merge sfx	2025-05-13 14:59:21 +09:00
benroshio	192a41bd45	puzzle sounds fix	2025-05-13 01:18:11 -04:00
Ji Yoon Rhee	847dcc87cf	merged sound files	2025-05-13 11:58:20 +09:00
benroshio	5cefed2d01	Bunny puzzle music added + audio mixing tweaks	2025-05-12 14:38:11 -04:00
7heIVIaze	dba81fdf2a	update cooking hud	2025-05-13 01:38:09 +09:00
7heIVIaze	1216040f2d	restore my haesol class, it died before. T.T/ to remind, created tutorial hud prototype.	2025-05-13 01:27:41 +09:00
7heIVIaze	2bf5e5bbcc	merge	2025-05-13 00:22:54 +09:00
7heIVIaze	aaf966fbc6	Make tutorial widget prototype and merge to recorver my project	2025-05-12 23:42:12 +09:00

256 changed files with 3369 additions and 269 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) Normal file

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)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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) Normal file

Binary file not shown.

BIN

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

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) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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) Normal file

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)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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)

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) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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