55 Commits

Author SHA1 Message Date
c9ebb16f36 Added Spring Song yet again
Triple checked sync with main due to an issue with the Spring map not loading. Everything seems to work now
2025-04-25 19:30:13 -04:00
6f80cafaa3 Revert "Committing Changes(?)"
This reverts commit aac996d671.
2025-04-25 19:14:47 -04:00
5b40e6c814 Revert "Merge branch 'main' into fmod-co"
This reverts commit a42441f427, reversing
changes made to aac996d671.
2025-04-25 17:13:12 -04:00
78a9b1c17d Revert "Added Spring Song (again)"
This reverts commit aa05178a8a.
2025-04-25 17:08:45 -04:00
aa05178a8a Added Spring Song (again)
After syncing with main, got a working clean slate to resume working
2025-04-25 16:25:02 -04:00
a42441f427 Merge branch 'main' into fmod-co 2025-04-25 16:17:22 -04:00
aac996d671 Committing Changes(?)
Committing changes that aren't mine but Git is saying they're mine (Events for footsteps). Shouldn't mess anything up.
2025-04-25 13:35:28 -04:00
fae2bf06dd Added Second Spring Music 2025-04-25 13:17:52 -04:00
8301e2908e edit level - cave 2025-04-26 02:15:16 +09:00
4e963403ad Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-04-25 21:47:20 +09:00
68695fef60 Skill Cooldown UI Implmement
Implement skill cooldown UI and add the skill structure
2025-04-25 21:47:09 +09:00
9145d18cdd edit level 2025-04-25 18:50:25 +09:00
2c028658bb edit level 2025-04-25 00:41:42 +09:00
fd777aba62 added the puzzle area for the bunny 2025-04-25 00:05:03 +09:00
7ab90f7625 prepare to pull 2025-04-24 22:03:43 +09:00
0a198096e8 the font changes got wiped, re-pushing 2025-04-24 21:54:15 +09:00
82d6e54754 footstep sounds 2025-04-24 21:53:53 +09:00
a0b0117d7c rearranged some files, added base bunny logic blueprints 2025-04-24 21:53:32 +09:00
e31a861a28 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-04-24 15:22:20 +09:00
dd71ece538 re-adding the stylized foliage assets for wonjun 2025-04-24 15:21:35 +09:00
7f70ce93a9 merge 2025-04-24 15:20:10 +09:00
4bedd6f2f3 fixed the VFX (it was wiped from shiori's merge) 2025-04-24 15:14:49 +09:00
f809686a56 I need to go to bed commit 2025-04-24 01:47:19 -04:00
d95d5284a6 Merge branch 'Shiori' 2025-04-24 01:16:46 -04:00
ce119df186 Revert "stylized grass pack added"
This reverts commit 171251b4e1.
2025-04-24 00:49:44 -04:00
171251b4e1 stylized grass pack added 2025-04-23 20:56:08 +09:00
abad527aae new foliage assets 2025-04-23 20:55:38 +09:00
dcf8eef0e6 removed unused foliage 2025-04-23 20:54:43 +09:00
1b00512305 just push 2025-04-23 20:36:44 +09:00
5a458545e3 prepare to pull 2025-04-23 17:05:21 +09:00
d54a2187d2 Assets re added 2025-04-22 13:37:25 -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
8b01d76722 changed the font for inventory item slot UI item 2025-04-23 00:37:48 +09:00
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
9eb42778b2 forgot to add the changes in the map 2025-04-23 00:33:36 +09:00
ab2db3358f Content/Hwanyoung/Levels/Sprink_TEST.umap 2025-04-23 00:32:27 +09:00
2c94031652 had to delete the Docs folder from the plug-ins folder 2025-04-23 00:31:24 +09:00
d2d9c77fcf when you got out of the field, the HP HUD disappears from the viewport 2025-04-23 00:30:08 +09:00
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
bc78126919 Built bank and added into UE - Sanin Rock Teleport Oneshot 2025-04-18 14:54:30 -04:00
0cac75517d Changed Rock Teleport Move to be a oneshot 2025-04-18 13:54:43 -04:00
0eeeda4657 commit for pulling 2025-04-18 23:19:21 +09:00
cb910372a3 deleted the jump attack from the input context 2025-04-17 22:03:31 +09:00
31f89934a9 haesol's ultimate skills almost finalized + WG_HPbars edit 2025-04-17 22:03:01 +09:00
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
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
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
668dc10200 pulling 2025-04-10 21:41:58 +09:00
261dcd4617 Haesol's Ult and update AI behavior
Ultimate skill makes NPC drowned and knockback, AI recorver health and back to original position when miss the player
2025-04-09 16:48:39 +09:00
e1e66072d8 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-09 16:19:28 +09:00
96f72616a7 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-09 13:56:27 +09:00
044238a67d 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-08 23:43:26 +09:00
470 changed files with 997 additions and 2407 deletions

View File

@ -1,13 +1,17 @@
{
{
"version": "1.0",
"components": [
"Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64",
"Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64",
"Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64",
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows10SDK.22000",
"Microsoft.VisualStudio.Component.Windows10SDK",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Workload.NativeCrossPlat",
"Microsoft.VisualStudio.Workload.NativeDesktop",
"Microsoft.VisualStudio.Workload.NativeGame"
"Microsoft.VisualStudio.Workload.NativeGame",
"Microsoft.VisualStudio.Workload.Universal"
]
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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