40 Commits

Author SHA1 Message Date
552b32ed56 Merge branch 'Shiori' into Fmod-Intergration-V2 2025-04-11 11:31:27 -04:00
5987dbc276 Merge branch 'main' into Shiori 2025-04-07 23:04:35 -04:00
28dcf82cca Auto stash before merge of "Shiori" and "main" 2025-04-07 23:04:18 -04:00
08606779a8 Merge remote-tracking branch 'origin/main' 2025-04-07 20:18:46 -04:00
34ddeeea05 edit level, add campfire asset, plants asset 2025-04-08 04:31:42 +09:00
4480f56677 collision makes the player to bounce off; the exact numbers can be altered after playtesting 2025-04-06 22:53:08 +09:00
45a8be233a Resolve conflict: Sharon=theirs, TEST=ours 2025-04-06 21:19:23 +09:00
1a8f87f2ec edit landscape 2025-04-06 21:02:44 +09:00
4c233c7d0b sanin's ultimate related AOE material + animation clean up 2025-04-05 23:52:46 +09:00
545e81dcdc edit level 2025-04-05 02:00:16 +09:00
e150ec9cba edit level 2025-04-04 15:25:42 +09:00
2d2091cf61 Haesol Ult Skill Update and merge with main
Ultimate Skill Mechanism Updated, Use Spline and timeline
2025-04-02 16:27:37 +09:00
bfcdb6dce7 Haesol Ult Skill Update and pull from main
Ultimate Skill Mechanism Updated, Use Spline and timeline
2025-04-01 23:48:59 +09:00
d702c69825 Haesol Ult Skill Update
Ultimate Skill Mechanism Updated, Use Spline and timeline
2025-04-01 23:36:03 +09:00
1722586de6 plug-in settings modified, download free body snapper plugin 2025-04-01 23:05:06 +09:00
c3962e90ec added the cel-shader to the level blueprint 2025-04-01 23:04:22 +09:00
8508737b87 skeletal mesh for haesol replaced, added the new input binding for switching to close combat 2025-04-01 23:03:23 +09:00
5c115be210 san-in can throw down large gonggi stones and damage player; needs physics + visual improvements 2025-04-01 23:01:50 +09:00
7f32a3b61f edit level 2025-04-01 01:42:55 +09:00
1b17df5282 integration of SFXs and changing the haesol's character mesh to the updated model in BP_Haesol, pull with care 2025-03-28 22:30:17 +09:00
f385e0049b edit level 2025-03-28 02:50:10 +09:00
e17418ac4a HP bar and ult update
Update Boss&AggroNPC HP Bar System and Heasol's Ult Skill
2025-03-27 22:07:25 +09:00
5c975ddaa9 Arrow ult sound fix
added to bp_haesol
2025-03-26 23:23:02 -04:00
c2d22e51bd Fmod Events added for take damge bp 2025-03-26 22:13:29 -04:00
851b20c1c3 edit level 2025-03-25 19:43:09 +09:00
8f900dcb23 Resolved merge conflict in Sprink_TEST.umap 2025-03-25 19:33:06 +09:00
064b2f94ba added the cel-shader post processing onto the level 2025-03-25 19:08:15 +09:00
bf4a070fe7 made the retrieval of the gonggi stones to work 2025-03-25 19:07:53 +09:00
4e1bfa8a37 edit new level and Rock assets 2025-03-25 00:15:07 +09:00
9c16d978ff edit new level and additional environment assets 2025-03-24 13:04:55 +09:00
494bbedc21 added an option to differentiate hit SFXs for aggroNPCs 2025-03-23 11:59:39 +09:00
330455f8f5 the weighted random integer generation works for chance-based gonggi ult; the retrieval of the gonggi stones are not working properly 2025-03-23 01:07:04 +09:00
8d524dbdc4 fmod private integration data bank lookup edits, not sure what this does 2025-03-22 21:58:49 +09:00
6675002723 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-22 21:28:17 +09:00
40ee5a6f31 new gonggi stone asset for sanin 2025-03-22 21:26:46 +09:00
06bb0cfcf0 pull the level 2025-03-22 09:59:58 +09:00
df4c6c1cb7 New level map 2025-03-22 00:30:53 +09:00
e4427e3766 make a new level 2025-03-21 17:36:05 +09:00
0ec37c8330 delete 2025-03-21 13:32:22 +09:00
44c26b224c Merge remote-tracking branch 'origin/Fmod-Intergration-V2' 2025-03-19 14:00:45 -04:00
815 changed files with 3980 additions and 52730 deletions
.DS_Store.gitattributes.gitignoreREADME.md
hwanyoung2
Binaries
Content
ArcherAnimationSet
DEMO
Mannequin
Characters
FMOD
Fab
Fire_Pit
Megascans
3D
Animal_Skull_vikjeeraa
Broken_Tree_Branches_qdhxa
Granite_Rock_ohFsZ
Granite_Rock_pbpfM
Granite_Rock_pkeeM
Icelandic_Mossy_Rock_Formation_sktsW
Icelandic_Rock_skjsL
Mossy_Forest_Rock_wd3efd1
Mossy_Rock_pkxu2
Mossy_Tree_qbtt7
Nordic_Forest_Ledge_Rock_Large_xfpkee1
Rock_shopk
Plants
Haena_v02
Hwanyoung
Character
NPC
AI-Weapon
BP_AggroNPCBase.uassetBP_Goblin.uasset
Behavior
DT_BoosType.uassetS_BossType.uasset
Spring-Sanin
Anims-Sanin
ABP_Sanin.uassetABP_SaninSemiFinal.uassetBP_SaninDeath.uassetBSBP_SaninWalkRunCombat.uassetBSBP_SaninWalkRunPassive.uassetBS_caution.uassetBS_runStart.uassetBS_runend.uassetBS_runloop.uasset
MagicalAnimSet
Animations
01_idle.uasset02_shot_Finish.uasset02_shot_all.uasset02_shot_all_Dup.uasset02_shot_end.uasset02_shot_loop.uasset02_shot_start.uasset03_shotS_all.uasset03_shotS_end.uasset03_shotS_end1.uasset03_shotS_loop.uasset03_shotS_loop1.uasset03_shotS_start.uasset03_shotS_start1.uasset04_beam_all.uasset04_beam_end.uasset04_beam_end1.uasset04_beam_loop.uasset04_beam_loop1.uasset04_beam_start.uasset04_beam_start1.uasset05_chanting_all.uasset05_chanting_end.uasset05_chanting_end1.uasset05_chanting_loop.uasset05_chanting_loop1.uasset05_chanting_start.uasset05_chanting_start1.uasset06_chanting_all.uasset06_chanting_end.uasset06_chanting_end1.uasset06_chanting_loopA.uasset06_chanting_loopB.uasset06_chanting_loopB1.uasset06_chanting_middle.uasset06_chanting_middle1.uasset06_chanting_start.uasset07_force.uasset08_triplemagic.uasset09_football.uasset09_football1.uasset10_buff.uasset11_emote_spin.uasset11_emote_spin1.uasset12_emote_grace.uasset13_combo_1.uasset13_combo_1s.uasset13_combo_2.uasset13_combo_2s.uasset13_combo_3.uasset13_combo_3s.uasset13_combo_4.uasset13_combo_4s.uasset13_combo_5.uasset13_combo_5s.uassetBP_SaninDeathMontage.uassetBP_SaninFrontDamage.uasset
attack
caution_b.uassetcaution_f.uassetcaution_l.uassetcaution_r.uassetcombo_all.uasset
damage
damage_b.uassetdamage_f.uassetdamage_large_b.uassetdamage_large_b1.uassetdamage_large_f.uassetdamage_large_f1.uassetdeath.uasset
death
dodge
dodge_b.uassetdodge_b1.uassetdodge_bl.uassetdodge_bl1.uassetdodge_br.uassetdodge_br1.uassetdodge_f.uassetdodge_f1.uassetdodge_fl.uassetdodge_fl1.uassetdodge_fr.uassetdodge_fr1.uassetdodge_l.uassetdodge_l1.uassetdodge_r.uassetdodge_r1.uasset
dummy_attatch
emote
11_emote_spin
12_emote_grace
idle
jump_falling.uassetjump_land.uassetjump_start.uasset
locomotion
misc
reset.uassetrun_f_end.uassetrun_f_end1.uassetrun_f_loop.uassetrun_fl_end.uassetrun_fl_end1.uassetrun_fl_loop.uassetrun_fr_end.uassetrun_fr_end1.uassetrun_fr_loop.uassetrun_start_bl.uassetrun_start_bl1.uassetrun_start_br.uassetrun_start_br1.uassetrun_start_f.uassetrun_start_f1.uassetrun_start_l.uassetrun_start_l1.uassetrun_start_r.uassetrun_start_r1.uasset
UE_Mannequin
Montages
OLD
Sanin_Seq
Montages
Sequences
01_idle.uasset02_shot_end.uasset02_shot_loop.uasset02_shot_start.uasset03_shotS_end.uasset03_shotS_end1.uasset03_shotS_loop.uasset03_shotS_loop1.uasset03_shotS_start.uasset03_shotS_start1.uasset04_beam_end.uasset04_beam_end1.uasset04_beam_loop.uasset04_beam_loop1.uasset04_beam_start.uasset04_beam_start1.uasset05_chanting_end.uasset05_chanting_end1.uasset05_chanting_loop.uasset05_chanting_loop1.uasset05_chanting_start.uasset05_chanting_start1.uasset06_chanting_end.uasset06_chanting_end1.uasset06_chanting_loopA.uasset06_chanting_loopB.uasset06_chanting_loopB1.uasset06_chanting_middle.uasset06_chanting_middle1.uasset06_chanting_start.uasset07_force.uasset08_triplemagic.uasset09_football.uasset09_football1.uasset10_buff.uasset11_emote_spin.uasset11_emote_spin1.uasset12_emote_grace.uasset13_combo_1.uasset13_combo_1s.uasset13_combo_2.uasset13_combo_2s.uasset13_combo_3.uasset13_combo_3s.uasset13_combo_4.uasset13_combo_4s.uasset13_combo_5.uasset13_combo_5s.uassetcaution_b.uassetcaution_f.uassetcaution_l.uassetcaution_r.uassetcombo_all.uassetdamage_b.uassetdamage_f.uassetdamage_large_b.uassetdamage_large_b1.uassetdamage_large_f.uassetdamage_large_f1.uassetdeath.uassetdodge_b.uassetdodge_b1.uassetdodge_bl.uassetdodge_bl1.uassetdodge_br.uassetdodge_br1.uassetdodge_f.uassetdodge_f1.uassetdodge_fl.uassetdodge_fl1.uassetdodge_fr.uassetdodge_fr1.uassetdodge_l.uassetdodge_l1.uassetdodge_r.uassetdodge_r1.uassetjump_falling.uassetjump_land.uassetjump_start.uassetreset.uassetrun_f_end.uassetrun_f_end1.uassetrun_f_loop.uassetrun_fl_end.uassetrun_fl_end1.uassetrun_fl_loop.uassetrun_fr_end.uassetrun_fr_end1.uassetrun_fr_loop.uassetrun_start_bl.uassetrun_start_bl1.uassetrun_start_br.uassetrun_start_br1.uassetrun_start_f.uassetrun_start_f1.uassetrun_start_l.uassetrun_start_l1.uassetrun_start_r.uassetrun_start_r1.uasset
Sequences
BP_BossField.uassetBP_SanIn.uassetBP_SanIn_Dup.uassetBP_SaninController.uassetE_SaninNormalAttackPhase.uasset
PlayerCharacter
Illusions
Levels
UI
IdaFaber
Illusions
.cache
.unsaved
.user
.user
Assets
Metadata
MSPresets
MixedVFX
Stone_and_Erth_VFX
Intermediate
Plugins
FMODStudio
Binaries
Docs
Intermediate
Saved
Config
hwanyoung2.uproject

BIN
.DS_Store vendored

Binary file not shown.

13
.gitattributes vendored

@ -1,13 +0,0 @@
# UE file types
*.uasset filter=lfs diff=lfs merge=lfs -text binary
*.umap filter=lfs diff=lfs merge=lfs -text binary
# Raw Content types
*.fbx filter=lfs diff=lfs merge=lfs -text
*.3ds filter=lfs diff=lfs merge=lfs -text
*.psd filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text
*.wav filter=lfs diff=lfs merge=lfs -text
*.xcf filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text

96
.gitignore vendored

@ -1,96 +0,0 @@
# ---> UnrealEngine
# Visual Studio 2015 user specific files
.vs/
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
*.ipa
# These project files can be generated by the engine
*.xcodeproj
*.xcworkspace
*.sln
*.suo
*.opensdf
*.sdf
*.VC.db
*.VC.opendb
# Precompiled Assets
SourceArt/**/*.png
SourceArt/**/*.tga
# Binary Files
Binaries/*
Plugins/*/Binaries/*
# Builds
Build/*
# Whitelist PakBlacklist-<BuildConfiguration>.txt files
!Build/*/
Build/*/**
!Build/*/PakBlacklist*.txt
# Don't ignore icon files in Build
!Build/**/*.ico
# Built data for maps
*_BuiltData.uasset
# Configuration files generated by the Editor
Saved/*
# Compiled source files for the engine to use
Intermediate/*
Plugins/*/Intermediate/*
# Cache files for the editor to use
DerivedDataCache/*
hwanyoung2/Saved/Config/CrashReportClient/UECC-Mac-34EEC289FE4D9617CF67F4B263CA0A34/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Mac-3FEFDE13C040C6AB015942BCAAA94AC5/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Mac-8229A4D1044074E7E57688B9C8584F35/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Mac-8FF2349872403D15924AA7A9DDD88FA9/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Windows-1CB0ECA540B203164FBC5CB7E3D18513/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Windows-3CBF4142422E61BB391467A4D90E8A0A/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Windows-9E1B6C68493CF0477FFBEFB39A92819A/CrashReportClient.ini
hwanyoung2/Saved/Config/CrashReportClient/UECC-Windows-D69725EC4A973970CFFC03B9FDD5D423/CrashReportClient.ini
hwanyoung2/Intermediate/ReimportCache/3688439234.bin
hwanyoung2/Plugins/FMODStudio/Docs/images/source-control.png

@ -1,2 +0,0 @@
# Illusion: Legends of Lost Souls (UE5.1)

@ -1,7 +0,0 @@
{
"BuildId": "27405482",
"Modules":
{
"hwanyoung2": "UnrealEditor-hwanyoung2.dll"
}
}

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Hit_4.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.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
hwanyoung2/Content/Fab/Fire_Pit/defaultMat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/Fab/Fire_Pit/defaultMat_baseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/Fab/Fire_Pit/defaultMat_normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/Fab/Fire_Pit/scene.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.

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.

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