Compare commits

base: neroberovero:ce119df18617723e5c33374465dc0e9a3d960713

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

43 Commits

ce119df186 ... f3c2b4802c

Author	SHA1	Message	Date
wonjoon	f3c2b4802c	Finalize merge after resolving conflicts	2025-04-24 14:17:37 +09:00
wonjoon	c50316c43c	Resolved merge conflict using remote version of Sprink_TEST.umap	2025-04-24 14:00:24 +09:00
wonjoon	a2f29995d2	merge	2025-04-24 13:52:07 +09:00
benroshio	03f6e86d22	Merge remote-tracking branch 'origin/main'	2025-04-24 00:01:23 -04:00
benroshio	3071305238	Merge rebase shenanigans 1	2025-04-23 23:58:36 -04:00
Ji Yoon Rhee	fb4b15c701	stylized grass pack added	2025-04-23 23:46:44 -04:00
Ji Yoon Rhee	8bb66bc58d	new foliage assets	2025-04-23 23:46:42 -04:00
Ji Yoon Rhee	c69d0d6055	removed unused foliage	2025-04-23 23:46:40 -04:00
wonjoon	62a93b4d3e	just push	2025-04-23 23:46:40 -04:00
Ji Yoon Rhee	04dd610530	changed the font for inventory item slot UI item	2025-04-23 23:46:31 -04:00
Ji Yoon Rhee	7d39cc8bc9	haesol: fixed Q skill issue, added ult point calculation for the rest of haesol's skills	2025-04-23 23:46:30 -04:00
Ji Yoon Rhee	baeadbe98e	Content/Hwanyoung/Levels/Sprink_TEST.umap	2025-04-23 23:46:14 -04:00
Ji Yoon Rhee	f2130dbcc7	had to delete the Docs folder from the plug-ins folder	2025-04-23 23:46:13 -04:00
Ji Yoon Rhee	ec8b13f4ff	when you got out of the field, the HP HUD disappears from the viewport	2025-04-23 23:46:00 -04:00
Ji Yoon Rhee	2578417478	deleted the jump attack from the input context	2025-04-23 23:45:16 -04:00
Ji Yoon Rhee	a33028a63d	haesol's ultimate skills almost finalized + WG_HPbars edit	2025-04-23 23:45:15 -04:00
Ji Yoon Rhee	fe05703f95	modified the HP bar UI logic for aggro NPCs	2025-04-23 23:44:54 -04:00
wonjoon	4fcbc76372	edit level, make a house asset	2025-04-23 23:44:27 -04:00
7heIVIaze	46d240be6e	commit for pulling	2025-04-23 23:44:18 -04:00
7heIVIaze	9895b952ca	pulling	2025-04-23 23:44:05 -04:00
7heIVIaze	16f86602e5	Haesol's Ult and update AI behavior(recorver health), ready to pull from main ... Ultimate skill makes NPC drowned and knockback, AI recorver health and back to original position when miss the player	2025-04-23 23:44:03 -04:00
7heIVIaze	155a1393fa	Haesol's Ult and update AI behavior(recorver health) ... Ultimate skill makes NPC drowned and knockback, AI recorver health and back to original position when miss the player	2025-04-23 23:42:51 -04:00
benroshio	d54a2187d2	Assets re added	2025-04-22 13:37:25 -04:00
benroshio	dafcf19ad4	push before merge	2025-04-22 13:27:33 -04:00
benroshio	8a16a189df	Footsteps implemented + Menu And Arrow sfx bug fixes	2025-04-18 19:03:20 -04:00
benroshio	684769903a	Merge branch 'main' into Shiori	2025-04-16 12:37:20 -04:00
benroshio	cee542b25b	Merge remote-tracking branch 'origin/main'	2025-04-16 12:35:46 -04:00
benroshio	e7c2adfd89	Merge branch 'Fmod-Intergration-V2' into Shiori	2025-04-16 12:35:08 -04:00
benroshio	6dfcbdfd48	Missing Sfx Fix	2025-04-16 12:25:39 -04:00
benroshio	c2c29e303f	Merge branch 'fmod-co' into Fmod-Intergration-V2	2025-04-12 14:05:17 -04:00
benroshio	feb0fee599	merge	2025-04-12 14:02:21 -04:00
benroshio	701d9bcb05	Merge branch 'fmod-co' into Shiori	2025-04-12 13:52:49 -04:00
benroshio	e25825931c	Sanin timing fix	2025-04-12 13:47:37 -04:00
benroshio	6d57eb432d	Fmod bank refresh	2025-04-11 11:35:03 -04:00
benroshio	552b32ed56	Merge branch 'Shiori' into Fmod-Intergration-V2	2025-04-11 11:31:27 -04:00
benroshio	640f6b5db5	Merge remote-tracking branch 'origin/main'	2025-04-11 11:28:43 -04:00
benroshio	20f6849d90	Merge remote-tracking branch 'origin/main'	2025-04-07 23:19:03 -04:00
benroshio	5987dbc276	Merge branch 'main' into Shiori	2025-04-07 23:04:35 -04:00
benroshio	28dcf82cca	Auto stash before merge of "Shiori" and "main"	2025-04-07 23:04:18 -04:00
benroshio	08606779a8	Merge remote-tracking branch 'origin/main'	2025-04-07 20:18:46 -04:00
hozach	499fc3ae18	Footsteps - Grass - Boots	2025-04-04 18:35:16 -04:00
hozach	74e1948c35	Rock Teleport for Sanin	2025-04-04 18:28:24 -04:00
benroshio	5c975ddaa9	Arrow ult sound fix ... added to bp_haesol	2025-03-26 23:23:02 -04:00

595 changed files with 5238 additions and 165 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)

Binary file not shown.

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/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Loop_Sweetener.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Appear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Appear_Disappear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Disappear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_Start_-_Oneshot.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Dirt_Walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Grass_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Grass_walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Stone_Run.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/FMOD/PrivateIntegrationData/BankLookup.uasset (Stored with Git LFS)

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

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

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

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/Animations/ABP_Haesol1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/AS_Bow_InPlace_Run_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/AS_Bow_InPlace_Walk_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Hwando_Run_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Walk_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Walk_InPlace.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) Normal file

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/Interactables/BP_CraftingTable.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/Levels/Textures/Foliage_Ground.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliaged_Ground_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset (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/IdaFaber/Demo/Animations/Boy/AS_UE5_MM_Jump.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/IdaFaber/Demo/Animations/Boy/AS_UE5_MM_Land.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/067D291C.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1883A555.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B15B64E.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1CA6CC10.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/20D9487C.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/24CD2F65.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2BE87DD4.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2CBF1416.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2D43A925.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2DE6E3A9.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3E01747B.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3EBE7637.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/457A1354.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/46CD53C6.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4A856CF6.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5033A088.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/528EAB1B.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/60C6A5A7.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/61BF9D54.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6FCF773F.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/71B27784.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/74F9F1FD.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7BC3CDFF.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7BE1D0E5.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/88B3B2EE.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/953EEBCA.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9D83D5B3.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A133E8F8.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/ABF67778.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/AE1A79F6.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B59CCC19.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B68869C2.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B7C5FC58.fobj Normal file

Binary file not shown.

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