Compare commits

base: neroberovero:04d450983e9b20dcd8b41146310b733a296775bb

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:132903cbb7db60243203f28234641ae72bb856ae

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

10 Commits

04d450983e ... 132903cbb7

Author	SHA1	Message	Date
benroshio	132903cbb7	Merge remote-tracking branch 'origin/main' into Shiori	2025-03-17 12:27:54 -04:00
Ji Yoon Rhee	fb9eec0c9e	added a public lifespan variable in rock proj for more flexible lifetime setting when spawning new rocks	2025-03-18 00:11:06 +09:00
Ji Yoon Rhee	ad6fb1ba83	fixing the conflict	2025-03-17 23:10:08 +09:00
Ji Yoon Rhee	4b42d5c89e	added my progress for sanin's ultimate	2025-03-17 23:01:48 +09:00
7heIVIaze	bd7ade3fc1	Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5	2025-03-17 22:52:27 +09:00
7heIVIaze	3c6aa5bb7e	Haesol's skill update ... Haesol's C skill and Ult skill updated.	2025-03-17 22:52:18 +09:00
Ji Yoon Rhee	45dc63bf4a	example commit: added sanin ultimate related data structure	2025-03-16 20:21:16 +09:00
7heIVIaze	0c9635888b	conflict	2025-03-11 12:33:05 +09:00
7heIVIaze	b62ed9bfdb	implement goblin's damage to player	2025-03-11 12:24:54 +09:00
7heIVIaze	08a405291b	implement goblin's damage to player	2025-03-10 21:30:51 +09:00

35 changed files with 77 additions and 44 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/Haena_v02/Meshes/Character/SK_Haena_v02_Skeleton.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/Hwanyoung/Character/E_CharacterState.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset (Stored with Git LFS) Normal file

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_AggroNPCControllerBase2.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/BST/BST_SaninAttack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_all.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/NPC/Spring-Sanin/S_Gonggi.uasset (Stored with Git LFS) 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/IKRig/IKRetargeter_Haesol.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_HaesolUltProjectileAOE.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)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/IdaFaber/Meshes/Boy/SKEL_UE5_M.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_21.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_26.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Intermediate/ReimportCache/3688439234.bin

Binary file not shown.

2

hwanyoung2/Saved/Config/WindowsEditor/Editor.ini

File diff suppressed because one or more lines are too long