116 Commits

Author SHA1 Message Date
930e5bf2df Update to Dialogue Table with Angela's changes. 2025-05-13 12:57:12 -04:00
c51b89e61c Plugged in pansori dialogue sounds! 2025-05-13 12:49:30 -04:00
9e86a9abfa dokkaebi has its attack weapon now 2025-05-13 23:24:37 +09:00
17afa9b470 added the stagger anim montage as variable 2025-05-13 22:39:28 +09:00
be5b88d38c added cooking SFX to cooking HUD widget 2025-05-13 22:38:55 +09:00
ecbb987836 added the player start in the tutorial cave 2025-05-13 22:38:31 +09:00
4330a2b1a0 FINALLY DOKKAEBI RELATED FILES ARE UPLOADING 2025-05-13 22:37:50 +09:00
e84a0bd09c dokkaebi skeletal mesh 2025-05-13 22:28:18 +09:00
6b0ac6a201 dokkaebi materials please work please please 2025-05-13 22:25:14 +09:00
c4c90be427 deleted some stuff related to dokkaebi 2 2025-05-13 22:24:09 +09:00
8b99f46832 deleted some stuff related to dokkaebi 2025-05-13 22:22:34 +09:00
59f0d04da9 overwrite haesol 2025-05-13 21:29:19 +09:00
49e26b489b Merge 2025-05-13 17:50:43 +09:00
2420a2baa2 Created Tutorial Widget and Tutorial Text
Tutorial Widget, Tutorial Text Data Table, Images for tutorial, and created logic for tutorials
2025-05-13 17:49:52 +09:00
6cf991b47c NPC changes 2025-05-13 16:09:19 +09:00
c3395a1bac fixed the dialogue audio bug, now can play the dialogue melodic lines 2025-05-13 15:58:39 +09:00
d0818c4c80 merged changes for HUDs from reaven 2025-05-13 15:07:48 +09:00
5402fbc023 bank built from SFX designers 2025-05-13 15:07:12 +09:00
057ae35081 merge for SFXs (for like the nth time) 2025-05-13 15:06:32 +09:00
82b9ff8ff0 merge sfx 2025-05-13 14:59:21 +09:00
192a41bd45 puzzle sounds fix 2025-05-13 01:18:11 -04:00
847dcc87cf merged sound files 2025-05-13 11:58:20 +09:00
5cefed2d01 Bunny puzzle music added + audio mixing tweaks 2025-05-12 14:38:11 -04:00
dba81fdf2a update cooking hud 2025-05-13 01:38:09 +09:00
1216040f2d restore my haesol class, it died before. T.T/ to remind, created tutorial hud prototype. 2025-05-13 01:27:41 +09:00
887cdf76e4 Merge branch 'main' into Chaz 2025-05-12 11:23:46 -04:00
2bf5e5bbcc merge 2025-05-13 00:22:54 +09:00
f85001ea9c idk why it keeps reseting MY CHANGES HELLO????????????????? 2025-05-13 00:21:47 +09:00
839743c3b7 Bunny Squeaks! Into UE! 2025-05-12 11:15:35 -04:00
0bfa54fdea Build Banks (forgot to do that last commit) 2025-05-12 10:54:24 -04:00
0066cdad61 Added Cooking SFX and Soul Collect to FMOD as Events
Did a little organization to the actual assets within FMOD (put them in folders)
2025-05-12 10:53:24 -04:00
aaf966fbc6 Make tutorial widget prototype and merge to recorver my project 2025-05-12 23:42:12 +09:00
3aadd3dab6 forgot to change the button text to COOK 2025-05-12 23:35:42 +09:00
ad3e750d73 Added Bunny as actual FMOD Events, updated changes from Main 2025-05-12 10:32:28 -04:00
779c21601a dialogue translations added 2025-05-12 22:55:38 +09:00
d2080e63c7 large gonggi stone fall down SFX integrated 2025-05-12 22:55:23 +09:00
1bd75f8186 bunny dialogue debug temp push 2025-05-12 22:54:53 +09:00
4c9d3cdc7c merging from sfx branch for rock fall 2025-05-12 22:53:21 +09:00
6883e2cbba changed the dialogue struct for temporary SFX implementation 2025-05-12 22:52:46 +09:00
a5abbd2d7b merge from reaven's UI edits 2025-05-12 22:52:07 +09:00
19c97af410 dokkaebi static mesh, needs to work on rig anims 2025-05-12 22:42:58 +09:00
d0c5eca6fc Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-05-12 17:25:27 +09:00
d8e4eec553 Fit UMG to aspect ratio, and bug fix
wrap all umg with scale box and size box to fit aspect ratio. and Fix haesol's ult bug
2025-05-12 17:25:12 +09:00
4f87f954b9 bunny puzzle music fmod logic 2025-05-12 04:07:27 -04:00
caf0c47745 Merge remote-tracking branch 'origin/main' 2025-05-11 23:09:24 -04:00
9329fd919b Merge branch 'main' into Chaz 2025-05-11 13:22:34 -04:00
7c7ea8a57e Added Tweaked Rockfall SFX to FMOD only 2025-05-11 13:21:25 -04:00
02c6ea8454 temp push the current commit 2025-05-12 00:16:32 +09:00
97f819d001 Update HUD, Haesol's ult logic, and wrap all widgets scale box, size box 2025-05-11 22:35:47 +09:00
447cefeaa2 added VFX to haesol's ultimate AOE 2025-05-11 22:28:07 +09:00
59f77cbcc9 Auto stash before merge of "main" and "origin/main" 2025-05-10 23:50:26 -04:00
063fa6146c dialogue localization and added bunny dialogue lines for early puzzle quit 2025-05-11 12:29:03 +09:00
491656378e edited some descriptions for items 2025-05-11 12:28:29 +09:00
57c3968d0f preliminary work for sfx integration for interactable bunny 2025-05-11 12:27:56 +09:00
ffcd1cac98 merge with chaz's branch 2025-05-11 12:26:02 +09:00
78c992e071 Added an assortment of rock/stone falling impacts ranging from medium to huge
Hopefully at least one is useful!
2025-05-10 15:18:18 -04:00
e793cb7deb Added dialogue audio assets to UE and exactly one dialogue sound to voice. 2025-05-10 14:15:34 -04:00
05e59aaf69 Merge branch 'main' into Chaz 2025-05-10 13:24:35 -04:00
3dda723d5c Merge branch 'main' into Chaz 2025-05-10 13:21:44 -04:00
f9035b72e2 Added Dialogue UI sounds to FMOD
Also added CO's spring song to the playlist and adjusted the loop range of the playlist. Noting in case it doesn't work out.
2025-05-10 13:19:04 -04:00
25e07ef7e5 recovering chaz's files for the UI related sounds 2025-05-11 00:07:21 +09:00
110d80a2d7 Update Skill Cooldown Timer for UI 2025-05-11 00:06:22 +09:00
70a785d170 extra adjustments on the item slot text font 2025-05-10 22:14:16 +09:00
6cf96ee241 i think i have my stuff back now 2025-05-10 22:11:36 +09:00
e11d9f416b cooking cauldron + cooking HUD + player HUD skill icon update 2025-05-10 22:00:08 +09:00
89edac3770 what even is this 2025-05-10 21:14:19 +09:00
a62a9af2ff DOT tick sfx? 2025-05-10 21:10:19 +09:00
53546f7059 merge chaz's new files? 2025-05-10 21:06:08 +09:00
253ba3ab7e bow fixes and music mixing 2025-05-10 00:56:28 -04:00
bed2744ac4 Auto stash before merge of "main" and "origin/main" 2025-05-10 00:26:19 -04:00
2d0a179637 Merge remote-tracking branch 'origin/main' 2025-05-10 00:25:55 -04:00
a3eb9bf34d Try to fix Craft/Cook Widget and merge 2025-05-10 11:09:12 +09:00
5bcec36ae2 temp push for reaven 2025-05-10 11:06:18 +09:00
6ad71ab3dc Auto stash before merge of "main" and "origin/main" 2025-05-09 21:42:31 -04:00
b258f5d4bb Committing Bank and Spring song again 2025-05-09 21:38:02 -04:00
5705039642 Merge branch 'main' into Chaz 2025-05-09 21:34:57 -04:00
ecde0df6ca Dragon audio fix and Menu sounds fix 2025-05-09 19:00:04 -04:00
2c39533212 segmented chest into fmod and UE 2025-05-09 17:25:07 -04:00
332ad0ca2f Chest Sound into FMOD 2025-05-09 16:22:10 -04:00
8dc1d992e2 Merge branch 'main' into Chaz 2025-05-09 11:23:07 -04:00
aa100f64f4 adjusted the nav mesh a bit on sanin's side 2025-05-10 00:02:27 +09:00
f9f18738e4 dialogue options added for Sanin pre- and post-combat + new struct fields for adding SFXs and bark/effort lines in dialogue 2025-05-09 23:58:29 +09:00
6cc1f0f503 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-05-09 21:44:39 +09:00
5eeacc4eeb merge 2025-05-09 21:44:32 +09:00
73d50b0882 treasure chest (for sound designers) 2025-05-09 21:35:45 +09:00
0a2353eb24 merge 2025-05-09 17:00:06 +09:00
76dfbba704 Made Dialogue Eye Close/Open Animation, Fix Bugs 2025-05-09 16:43:30 +09:00
12b6657adf modeling bridge asset 2025-05-09 14:33:37 +09:00
f632fe17b2 organizing asset folders 2025-05-09 03:01:35 +09:00
2a64c6f684 solve merge confliction 2025-05-07 21:16:09 +09:00
95c35329e9 Make Game Instance and a structure to manage lore data. And Fix Haesol's AOE Skill bugs, mobs group battle 2025-05-07 21:10:05 +09:00
1da96a5dc3 edit level - bunny boss area, gobiln combat area 2025-05-07 15:19:59 +09:00
145aa6f0be DRAGON SOUNDS RAAHHHH 2025-05-06 23:10:23 -04:00
ecbef9d6ae Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-05-06 20:37:02 +09:00
314e940487 Fix Puzzle area respawn error. 2025-05-06 20:36:55 +09:00
8fa0c08c0f Auto stash before merge of "main" and "origin/main" 2025-05-05 19:09:35 -04:00
670df2f1c3 edit level, add item box 2025-05-05 23:57:39 +09:00
ff3e39ab4d deleted the unnecessary puzzle field AOE blueprint from the sprink_test map 2025-05-05 20:30:18 +09:00
635c4bfb04 improved dialogue system for puzzle NPC 2025-05-05 20:29:29 +09:00
56630f16bf treasure chest BP 2025-05-05 20:29:00 +09:00
b7a4095ee3 Resolve conflict: use remote version of dragon_ult_uncut.uasset 2025-05-05 20:23:35 +09:00
172659a9c7 merge and edit level 2025-05-05 20:21:27 +09:00
c1b2d91c28 Improve dialogue system
remove base hud and add to viewport the dialogue system when dialoguing. and add sprites of bunnies for testing
2025-05-05 19:23:17 +09:00
97670c3df5 bug fix puzzle start event, and implement failed to use mana cuz of insufficient mana
change use mana logic and using haesol's skill logic. change replying logic by updating istrigger
2025-05-04 22:30:40 +09:00
f44eb40592 change the logic of puzzle start 2025-05-04 00:37:10 +09:00
0fa45e41c5 i added the bunny NPC and stuff, please use my version of the map file 2025-05-04 00:21:47 +09:00
4a9bd8766d added some more dialogues and useful assets like tree ribbons(?) and treasure chest 2025-05-04 00:21:05 +09:00
dfad2e0010 BTTs abstracted to use for both types of NPCs + bunny NPC can use dialogue to indicate puzzle success/fail 2025-05-04 00:17:38 +09:00
ebc53ac266 Merge branch 'main' into Chaz 2025-05-03 10:31:15 -04:00
ba805ee70b add treeribbon asset 2025-05-03 13:06:26 +09:00
5d9b550d18 Commit merge main into my branch! 2025-05-02 20:19:01 -04:00
eecffe8dca Merge branch 'main' into Chaz 2025-05-02 20:18:32 -04:00
d0980840ad complete merge 2025-05-03 08:52:55 +09:00
113523b8a6 Committing Added Assets (bunny and fem vox and spring song)
Also recommitting changes to uproject (animations don't save without added metadate I think)

Also omitting this from commit (changes are trying to delete this file):
F:\SAM SSD (iMac SSD2)\Git\Illusion-UE5\hwanyoung2\Content\Illusions\.unsaved\dragon ult uncut.ogg

Seems important?
2025-05-02 16:08:55 -04:00
b0a7367b7a Committing animation SFX FMOD asset and implementation into Sanin animation 2025-05-02 14:59:27 -04:00
8b76377bb4 added the nav mesh for bunny AI + incorporated dialogues into bunny NPC 2025-05-01 23:50:59 +09:00
1117 changed files with 14549 additions and 866 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
hwanyoung2/Content/Illusions/.cache/\{d547300b-f688-4816-b2a8-0edd5f5e77a1\}.pdc

View File

@ -2,6 +2,7 @@
GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
EditorStartupMap=/Game/Hwanyoung/Levels/Spring-Sharon.Spring-Sharon
GlobalDefaultGameMode=/Script/hwanyoung2.hwanyoung2GameMode
GameInstanceClass=/Game/Hwanyoung/Interactables/BP_GameInstance.BP_GameInstance_C
[/Script/Engine.RendererSettings]
r.Mobile.ShadingPath=0
@ -237,6 +238,7 @@ ManualIPAddress=
+Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.")
+Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ")
+Profiles=(Name="WaterBodyCollision",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="",CustomResponses=((Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="Default Water Collision Profile (Created by Water Plugin)")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="GroundOnly")
-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
@ -259,3 +261,6 @@ ManualIPAddress=
[Internationalization]
+LocalizationPaths=%GAMEDIR%Content/Localization/Text
[/Script/Engine.UserInterfaceSettings]
UIScaleRule=ScaleToFit

BIN
hwanyoung2/Content/FMOD/Events/Music/Bunny_Puzzle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/Music/Spring_2.uasset (Stored with Git LFS) Normal file

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.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/DOT_tick.uasset (Stored with Git LFS) Normal file

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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/UI_Select_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

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