Compare commits

base: neroberovero:f3c2b4802c7b253593fbbb57b58e1745fc612d39

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

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

2 Commits

f3c2b4802c ... f809686a56

Author	SHA1	Message	Date
benroshio	f809686a56	I need to go to bed commit	2025-04-24 01:47:19 -04:00
benroshio	d95d5284a6	Merge branch 'Shiori'	2025-04-24 01:16:46 -04:00

153 changed files with 192 additions and 195 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/ControlRig/Characters/Mech/Materials/Mech_Paint_Inst_Body.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.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_AggroNPCBase1.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/Behavior/BT_Tasks/BTT_SaninTeleport.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Montages/04_beam_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Montages/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/BP_SanIn1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn_Dup.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn_Dup1.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/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/Weapons/BP_HaesolDragon.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)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.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/Levels/Spring-Sharon.umap (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_BossHealthBar.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0001_-_Audio_-_Stone_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0002_-_Audio_-_Stone_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0003_-_Audio_-_Stone_03.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0004_-_Audio_-_Stone_04.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0005_-_Audio_-_Stone_05.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0006_-_Audio_-_Stone_06.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Concrete_Walk_-_0007_-_Audio_-_Stone_07.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Dirt/Walk/Dirt_Walk_-_0002_-_Audio_-_Dirt_Walk_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Dirt/Walk/Dirt_Walk_-_0003_-_Audio_-_Dirt_Walk_03.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Dirt/Walk/Dirt_Walk_-_0004_-_Audio_-_Dirt_Walk_04.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Dirt/Walk/Dirt_Walk_-_0005_-_Audio_-_Dirt_Walk_05.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Dirt/Walk/Dirt_Walk_-_0006_-_Audio_-_Dirt_Walk_06.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v10.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v11.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v12.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v13.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v14.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v15.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v16.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v17.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v18.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v19.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v20.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v21.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v22.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v23.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v24.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v25.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v26.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v5.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v6.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v7.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v8.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Jog/sfx_footsteps_grass_jog_v9.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v10.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v11.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v12.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v13.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v14.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v15.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v16.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v17.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v18.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v19.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v20.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v21.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v22.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v23.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v24.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v25.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v26.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v27.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v28.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v29.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v5.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v6.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v7.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v8.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Sprint/sfx_footsteps_grass_sprint_v9.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Walk/sfx_footsteps_grass_walk_v1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Walk/sfx_footsteps_grass_walk_v10.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Footsteps/Grass_-_Boots/Walk/sfx_footsteps_grass_walk_v11.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