|
|
f3c2b4802c
|
Finalize merge after resolving conflicts
|
2025-04-24 14:17:37 +09:00 |
|
|
|
c50316c43c
|
Resolved merge conflict using remote version of Sprink_TEST.umap
|
2025-04-24 14:00:24 +09:00 |
|
|
|
a2f29995d2
|
merge
|
2025-04-24 13:52:07 +09:00 |
|
benroshio
|
ce119df186
|
Revert "stylized grass pack added"
This reverts commit 171251b4e1083568711db0d3ec52bed22c94e006.
|
2025-04-24 00:49:44 -04: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 |
|
|
|
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 |
|
|
|
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 |
|
Ji Yoon Rhee
|
171251b4e1
|
stylized grass pack added
|
2025-04-23 20:56:08 +09:00 |
|
Ji Yoon Rhee
|
abad527aae
|
new foliage assets
|
2025-04-23 20:55:38 +09: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
|
8b01d76722
|
changed the font for inventory item slot UI item
|
2025-04-23 00:37:48 +09:00 |
|
Ji Yoon Rhee
|
e1403af025
|
haesol: fixed Q skill issue, added ult point calculation for the rest of haesol's skills
|
2025-04-23 00:36:25 +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 |
|
Ji Yoon Rhee
|
2c94031652
|
had to delete the Docs folder from the plug-ins folder
|
2025-04-23 00:31:24 +09:00 |
|
Ji Yoon Rhee
|
d2d9c77fcf
|
when you got out of the field, the HP HUD disappears from the viewport
|
2025-04-23 00:30:08 +09:00 |
|
7heIVIaze
|
ab50e701b2
|
Update the Tornado of Haesol's ultimate skill
Make faster the tornado rising and larger the length of tornado
|
2025-04-19 10:56:25 +09:00 |
|
benroshio
|
8a16a189df
|
Footsteps implemented + Menu And Arrow sfx bug fixes
|
2025-04-18 19:03:20 -04:00 |
|
7heIVIaze
|
0eeeda4657
|
commit for pulling
|
2025-04-18 23:19:21 +09:00 |
|
Ji Yoon Rhee
|
cb910372a3
|
deleted the jump attack from the input context
|
2025-04-17 22:03:31 +09:00 |
|
Ji Yoon Rhee
|
31f89934a9
|
haesol's ultimate skills almost finalized + WG_HPbars edit
|
2025-04-17 22:03:01 +09:00 |
|
Ji Yoon Rhee
|
00e4aac768
|
modified the HP bar UI logic for aggro NPCs
|
2025-04-17 22:00:53 +09: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 |
|
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 |
|
