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
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
2bf5e5bbcc
merge
2025-05-13 00:22:54 +09:00
839743c3b7
Bunny Squeaks! Into UE!
2025-05-12 11:15:35 -04:00
aaf966fbc6
Make tutorial widget prototype and merge to recorver my project
2025-05-12 23:42:12 +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
19c97af410
dokkaebi static mesh, needs to work on rig anims
2025-05-12 22:42:58 +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
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
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
110d80a2d7
Update Skill Cooldown Timer for UI
2025-05-11 00:06:22 +09:00
6cf96ee241
i think i have my stuff back now
2025-05-10 22:11:36 +09:00
bed2744ac4
Auto stash before merge of "main" and "origin/main"
2025-05-10 00:26:19 -04:00
5bcec36ae2
temp push for reaven
2025-05-10 11:06:18 +09:00
8dc1d992e2
Merge branch 'main' into Chaz
2025-05-09 11:23:07 -04: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
5eeacc4eeb
merge
2025-05-09 21:44:32 +09:00
76dfbba704
Made Dialogue Eye Close/Open Animation, Fix Bugs
2025-05-09 16:43:30 +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
145aa6f0be
DRAGON SOUNDS RAAHHHH
2025-05-06 23:10:23 -04:00
314e940487
Fix Puzzle area respawn error.
2025-05-06 20:36:55 +09:00
635c4bfb04
improved dialogue system for puzzle NPC
2025-05-05 20:29:29 +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
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
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
b0a7367b7a
Committing animation SFX FMOD asset and implementation into Sanin animation
2025-05-02 14:59:27 -04:00
981d34b6e1
Improve dialogue system and mana
...
Made Dialogue Button to skip and go next line, and add mana use function to have boolean value return
2025-05-02 23:57:48 +09:00
8b76377bb4
added the nav mesh for bunny AI + incorporated dialogues into bunny NPC
2025-05-01 23:50:59 +09:00
84cfc72ef9
merge for dragon anims
2025-05-01 19:07:30 +09:00
38fe73dee0
i forgot to add this on the first commit
2025-05-01 19:07:07 +09:00
f0b55cacaf
BT: bunny state can go fleeing <--> seen
2025-05-01 19:06:11 +09:00
f746612cbd
Fix Cooldown System & UI Bugs, and solved pull confliction
...
Fix the cooldown ui bugs by changing some nodes in haesol, and change some variables name in the structure. make a sample reply system for angela
2025-05-01 13:02:35 +09:00
75c36782a9
Implemented dialogue system and dialogue UI prototype
...
Implemented Dialogue System using dialogue Component and Interface, make Dialogue UI Prototype, and change the data type of the characters to be displayed in the UI in source code
2025-05-01 12:23:10 +09:00
28b3894640
Bug Fix
...
Aggro NPC's Set Moevement Speed interface Function
2025-04-29 22:16:20 +09:00
b8e2c42e0f
fixed some buggies
2025-04-29 22:10:51 +09:00
ce1636e2d7
Ready to push
2025-04-29 22:03:14 +09:00
bc7f6ad9f3
added the dialogue starting feature to the puzzle NPCs and player controller
2025-04-29 16:40:04 +09:00
af0ac5c5c2
Try to Implement Dialogue System and Improve the Crafting UI
2025-04-29 16:38:23 +09:00
5035dcf469
added the interface for dialogue system
2025-04-28 23:12:47 +09:00
