129 Commits

Author SHA1 Message Date
7f70ce93a9 merge 2025-04-24 15:20:10 +09:00
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
Ji Yoon Rhee
dcf8eef0e6 removed unused foliage 2025-04-23 20:54:43 +09:00
1b00512305 just push 2025-04-23 20:36:44 +09: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
c0aa37c621 Resolved merge conflict using remote version of Sprink_TEST.umap 2025-04-23 00:55:45 +09:00
1bbc60ccf3 merge 2025-04-23 00:46:16 +09:00
Ji Yoon Rhee
9eb42778b2 forgot to add the changes in the map 2025-04-23 00:33:36 +09:00
Ji Yoon Rhee
ab2db3358f Content/Hwanyoung/Levels/Sprink_TEST.umap 2025-04-23 00:32:27 +09:00
benroshio
8a16a189df Footsteps implemented + Menu And Arrow sfx bug fixes 2025-04-18 19:03:20 -04:00
56e0b28ffd Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-04-17 21:52:27 +09:00
daae4bed24 edit level, make a house asset 2025-04-17 21:46:46 +09:00
7heIVIaze
d7702d8ec0 haesol ult update and add VFX
Update haesol's ult and Add tsunami&ice VFX asset and then pull from main
2025-04-17 20:21:39 +09:00
7heIVIaze
ce0d1b37eb haesol ult update and add VFX
Update haesol's ult and Add tsunami&ice VFX asset
2025-04-17 20:14:34 +09:00
a6692ae98a edit level : tiger village town 2025-04-11 02:45:41 +09:00
072b4bd146 edit level 2025-04-09 02:35:22 +09:00
2aae5b391a edit level 2025-04-08 12:15:24 +09:00
34ddeeea05 edit level, add campfire asset, plants asset 2025-04-08 04:31:42 +09:00
45a8be233a Resolve conflict: Sharon=theirs, TEST=ours 2025-04-06 21:19:23 +09:00
1a8f87f2ec edit landscape 2025-04-06 21:02:44 +09:00
Ji Yoon Rhee
4c233c7d0b sanin's ultimate related AOE material + animation clean up 2025-04-05 23:52:46 +09:00
545e81dcdc edit level 2025-04-05 02:00:16 +09:00
e150ec9cba edit level 2025-04-04 15:25:42 +09:00
Ji Yoon Rhee
c3962e90ec added the cel-shader to the level blueprint 2025-04-01 23:04:22 +09:00
7f32a3b61f edit level 2025-04-01 01:42:55 +09:00
Ji Yoon Rhee
1b17df5282 integration of SFXs and changing the haesol's character mesh to the updated model in BP_Haesol, pull with care 2025-03-28 22:30:17 +09:00
f385e0049b edit level 2025-03-28 02:50:10 +09:00
851b20c1c3 edit level 2025-03-25 19:43:09 +09:00
8f900dcb23 Resolved merge conflict in Sprink_TEST.umap 2025-03-25 19:33:06 +09:00
Ji Yoon Rhee
064b2f94ba added the cel-shader post processing onto the level 2025-03-25 19:08:15 +09:00
4e1bfa8a37 edit new level and Rock assets 2025-03-25 00:15:07 +09:00
9c16d978ff edit new level and additional environment assets 2025-03-24 13:04:55 +09:00
df4c6c1cb7 New level map 2025-03-22 00:30:53 +09:00
e4427e3766 make a new level 2025-03-21 17:36:05 +09:00
0ec37c8330 delete 2025-03-21 13:32:22 +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
3c6aa5bb7e Haesol's skill update
Haesol's C skill and Ult skill updated.
2025-03-17 22:52:18 +09:00
7heIVIaze
08a405291b implement goblin's damage to player 2025-03-10 21:30:51 +09:00
Ji Yoon Rhee
4fc9e27698 re-added the corrupt ik rig + retargeter for haesol's new model, make sure you install Free IK Bone Snapper tool on unreal engine and enable the plug in before re-opening the ik rig 2025-03-05 23:19:00 +09:00
7heIVIaze
aff36733c6 sanin's melee attack technical alpha 2025-02-27 21:36:21 +09:00
Ji Yoon Rhee
e57fd047db some very minor changes for the two maps while testing the VFXs 2025-02-26 22:51:07 +09:00
7heIVIaze
2a5fdd4700 conflict fixed 2025-02-22 12:03:18 +09:00
7heIVIaze
05e8cbd1e3 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-02-21 22:35:38 +09:00
Ji Yoon Rhee
e2af4eacd5 map changes (no major changes that affects the current gameplay 2025-02-21 20:15:31 +09:00
7heIVIaze
67ddcc4249 Parry Implementation 2025-02-21 09:54:32 +09:00
Ji Yoon Rhee
575119e19f added and deleted the test assets i used for haesol's C skill implementation 2025-02-18 21:34:33 +09:00
7heIVIaze
627dd7e0b4 implement haesol's passive 2025-02-17 17:16:49 +09:00