neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: neroberovero:ebc53ac2669c21a2e26692be04b1b639909b36c7
Branches Tags
neroberovero:main
neroberovero:Chaz
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3
...
compare: neroberovero:8dc1d992e22f172edb85ec7fac9c1ec2d7acac57
Branches Tags
neroberovero:main
neroberovero:Chaz
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3

27 Commits
ebc53ac266 ... 8dc1d992e2

Author SHA1 Message Date
Hozach (Audio)
8dc1d992e2 Merge branch 'main' into Chaz 2025-05-09 11:23:07 -04:00
Ji Yoon Rhee
aa100f64f4 adjusted the nav mesh a bit on sanin's side 2025-05-10 00:02:27 +09:00
Ji Yoon Rhee
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
Ji Yoon Rhee
73d50b0882 treasure chest (for sound designers) 2025-05-09 21:35:45 +09:00
7heIVIaze
0a2353eb24 merge 2025-05-09 17:00:06 +09:00
7heIVIaze
76dfbba704 Made Dialogue Eye Close/Open Animation, Fix Bugs 2025-05-09 16:43:30 +09:00
wonjoon
12b6657adf modeling bridge asset 2025-05-09 14:33:37 +09:00
wonjoon
f632fe17b2 organizing asset folders 2025-05-09 03:01:35 +09:00
7heIVIaze
2a64c6f684 solve merge confliction 2025-05-07 21:16:09 +09:00
7heIVIaze
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
wonjoon
1da96a5dc3 edit level - bunny boss area, gobiln combat area 2025-05-07 15:19:59 +09:00
benroshio
145aa6f0be DRAGON SOUNDS RAAHHHH 2025-05-06 23:10:23 -04:00
7heIVIaze
ecbef9d6ae Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-05-06 20:37:02 +09:00
7heIVIaze
314e940487 Fix Puzzle area respawn error. 2025-05-06 20:36:55 +09:00
benroshio
8fa0c08c0f Auto stash before merge of "main" and "origin/main" 2025-05-05 19:09:35 -04:00
wonjoon
670df2f1c3 edit level, add item box 2025-05-05 23:57:39 +09:00
Ji Yoon Rhee
ff3e39ab4d deleted the unnecessary puzzle field AOE blueprint from the sprink_test map 2025-05-05 20:30:18 +09:00
Ji Yoon Rhee
635c4bfb04 improved dialogue system for puzzle NPC 2025-05-05 20:29:29 +09:00
Ji Yoon Rhee
56630f16bf treasure chest BP 2025-05-05 20:29:00 +09:00
wonjoon
b7a4095ee3 Resolve conflict: use remote version of dragon_ult_uncut.uasset 2025-05-05 20:23:35 +09:00
wonjoon
172659a9c7 merge and edit level 2025-05-05 20:21:27 +09:00
7heIVIaze
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
7heIVIaze
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
7heIVIaze
f44eb40592 change the logic of puzzle start 2025-05-04 00:37:10 +09:00
Ji Yoon Rhee
0fa45e41c5 i added the bunny NPC and stuff, please use my version of the map file 2025-05-04 00:21:47 +09:00
Ji Yoon Rhee
4a9bd8766d added some more dialogues and useful assets like tree ribbons(?) and treasure chest 2025-05-04 00:21:05 +09:00
Ji Yoon Rhee
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
121 changed files with 721 additions and 123 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

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

1
hwanyoung2/Config/DefaultEngine.ini
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

BIN
hwanyoung2/Content/FMOD/Desktop/Master.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Desktop/Master.strings.bank
View File

Binary file not shown.

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

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCControllerBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_Strafe.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Sanin.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_CheckPlayer.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_MeleeAttack.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SetStateAsCombative.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SetStateAsPassive.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_WaitForDialogueEnd.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_MobsGroupManager.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_BossField.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/bunny_diffuse.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/bunny_normals.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/bunny_test.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/fur.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Montages/BP_CombatFinaleSanin.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Sequences/damage_f.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SaninController.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Baking.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_diffuse.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_metalic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_normals.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_ao.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_diffuse.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_metals.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_normals.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/metal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_001Action.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_001Action_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_003Action.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_003Action_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_high_Armature_001Action.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_high_Armature_001Action_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_PhysicsAsset.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Skeleton.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/magnolia.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Haeil.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_HeavenlyArrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Mugwort.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/Anims_TreasureChest/BP_TreasureChestOpen.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/BP_GameInstance.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/BP_Save.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/BP_TreasureChest.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Interactables/S_Lore.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Building/SM_TreeRibbon_Skel.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Building/SM_TreeRibbon_SkelMesh.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Trees/Mugwort/Material/Leaf_ligthing.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueOptionWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/T_BunnySprite_Base.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/T_BunnySprite_Happy.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/T_BunnySprite_Sad.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/sanin-sprite-content.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/sanin-sprite-talk.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/EBA0CDAB.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{0bbb457e-d56a-416c-be6b-d409dd3caa27}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{0e3a2e3e-32e4-4182-8018-361bb31c6d39}.pdc Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{1f006aa4-2ede-44e7-888d-12cfc0bd0ffd}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{22e7f674-6e11-4c64-9219-cf1dc717edfa}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{36354e40-3dbe-4f55-89f5-e0d93dc1fcf6}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{3896e310-298f-4517-9f89-0ddda1bf8d7d}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{43a3738c-0acc-4951-a6dc-67681b238fc4}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{560e5048-fa34-470c-a547-e017b5f3befd}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{7e119f9b-f0f1-4954-ba30-71821aa433b9}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{8a7ed645-a152-4865-a244-8470f987f3c7}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc
View File

Binary file not shown.

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