161 Commits

Author SHA1 Message Date
e22942f7e4 Revert "push before merge"
This reverts commit dafcf19ad4.
2025-04-24 00:42:31 -04:00
dafcf19ad4 push before merge 2025-04-22 13:27:33 -04:00
8a16a189df Footsteps implemented + Menu And Arrow sfx bug fixes 2025-04-18 19:03:20 -04:00
684769903a Merge branch 'main' into Shiori 2025-04-16 12:37:20 -04:00
cee542b25b Merge remote-tracking branch 'origin/main' 2025-04-16 12:35:46 -04:00
e7c2adfd89 Merge branch 'Fmod-Intergration-V2' into Shiori 2025-04-16 12:35:08 -04:00
6dfcbdfd48 Missing Sfx Fix 2025-04-16 12:25:39 -04:00
d3cfbf7606 added minor changes almost negligible, started implementing the boss field for sanin 2025-04-16 23:23:43 +09:00
c9c9fdbf3f changed the font for inventory + interaction WGs 2025-04-16 23:22:33 +09:00
ab63088b25 no critical changes made, pretty much the same 2025-04-16 23:22:06 +09:00
fd2d84f25b changed the collision/overlap settings 2025-04-16 23:21:38 +09:00
d398ed0c5a added/edited VFX for sanin's abilities 2025-04-16 23:21:08 +09:00
d996e45fbe fixed the spawning logic of the large gonggi stones 2025-04-16 23:19:58 +09:00
ba1579e7b8 fixed the visual bug with rock pillar teleport + added new VFX for when the gonggi stones hit and damage player 2025-04-16 00:58:04 +09:00
33da1f4cae reattached the disconnected behavior nodes to Sanin combat BST 2025-04-15 00:44:44 +09:00
5ac3ef72ae debugged the runtime error with haesol's storm AOE BP 2025-04-15 00:44:00 +09:00
e55fe7a0c4 the 1st dirt trail rotates towards the player's location 2025-04-15 00:43:35 +09:00
d299f3738e haesol can rotate itself while activating skill 1 2025-04-15 00:42:37 +09:00
c2c29e303f Merge branch 'fmod-co' into Fmod-Intergration-V2 2025-04-12 14:05:17 -04:00
feb0fee599 merge 2025-04-12 14:02:21 -04:00
701d9bcb05 Merge branch 'fmod-co' into Shiori 2025-04-12 13:52:49 -04:00
e25825931c Sanin timing fix 2025-04-12 13:47:37 -04:00
6d57eb432d Fmod bank refresh 2025-04-11 11:35:03 -04:00
552b32ed56 Merge branch 'Shiori' into Fmod-Intergration-V2 2025-04-11 11:31:27 -04:00
640f6b5db5 Merge remote-tracking branch 'origin/main' 2025-04-11 11:28:43 -04:00
a6692ae98a edit level : tiger village town 2025-04-11 02:45:41 +09:00
47b16f6fde WIP version for sanin's first dirt trail fix 2025-04-10 21:39:27 +09:00
0ed1836a32 added the new dragon model 2025-04-10 21:36:24 +09:00
e8d52017be changed the player movement speed to be in accordance with the size of the new level 2025-04-09 11:44:16 +09:00
072b4bd146 edit level 2025-04-09 02:35:22 +09:00
20f6849d90 Merge remote-tracking branch 'origin/main' 2025-04-07 23:19:03 -04:00
2aae5b391a edit level 2025-04-08 12:15:24 +09: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
499fc3ae18 Footsteps - Grass - Boots 2025-04-04 18:35:16 -04:00
74e1948c35 Rock Teleport for Sanin 2025-04-04 18:28:24 -04: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
25e40d5316 Merge remote-tracking branch 'origin/Shiori' into Fmod-Intergration-V2 2025-03-19 14:00:09 -04:00
f3b7524759 shop and arrow array sfx 2025-03-19 13:34:42 -04:00
a245a4dae9 Update test 2025-03-17 12:28:37 -04:00
132903cbb7 Merge remote-tracking branch 'origin/main' into Shiori 2025-03-17 12:27:54 -04:00
fb9eec0c9e added a public lifespan variable in rock proj for more flexible lifetime setting when spawning new rocks 2025-03-18 00:11:06 +09:00
ad6fb1ba83 fixing the conflict 2025-03-17 23:10:08 +09:00
4b42d5c89e added my progress for sanin's ultimate 2025-03-17 23:01:48 +09:00
bd7ade3fc1 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-17 22:52:27 +09:00
3c6aa5bb7e Haesol's skill update
Haesol's C skill and Ult skill updated.
2025-03-17 22:52:18 +09:00
45dc63bf4a example commit: added sanin ultimate related data structure 2025-03-16 20:21:16 +09:00
0c9635888b conflict 2025-03-11 12:33:05 +09:00
b62ed9bfdb implement goblin's damage to player 2025-03-11 12:24:54 +09:00
08a405291b implement goblin's damage to player 2025-03-10 21:30:51 +09:00
04d450983e ik rigs and the retargeter changes while working with the new skeletal mesh integration 2025-03-09 23:46:33 +09:00
74d2963555 i dont remember what exact edits i made on original haesol and weapon mechanism, but i'm sure it were minor, very unimportant changes 2025-03-09 23:38:44 +09:00
a9519afac4 aim offset and animation blueprint made for haesol, needs tests after full integration of new haesol model 2025-03-09 23:32:28 +09:00
f267b0ecdf Haesol's Bow Animation Montage and Ult Skill Base 2025-03-06 23:31:15 +09:00
8f23fc4e2d Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-06 20:37:51 +09:00
52d82da085 please work 2025-03-06 20:27:29 +09:00
8ee9e62e54 merging...? 2025-03-06 20:27:14 +09:00
c083287628 merging changes on my side pt 1 2025-03-06 20:26:27 +09:00
92ed906280 bow related animations for new haesol model 2025-03-06 20:21:01 +09:00
408fc32428 Goblin Group Battle and pull from main 2025-03-06 18:37:17 +09:00
9740034248 Goblin Group Battle 2025-03-06 15:20:02 +09:00
4fc9e27698 re-added the corrupt ik rig + retargeter for haesol's new model, make sure you install Free IK Bone Snapper tool on unreal engine and enable the plug in before re-opening the ik rig 2025-03-05 23:19:00 +09:00
ac984d5157 removed faulty retargeters 2025-03-05 23:18:01 +09:00
1421dd6ae6 test commit 2025-03-05 23:17:19 +09:00
737bc62fe5 some miscellaneous edits for the ik rigs + ik retargeter 2025-03-05 21:10:39 +09:00
28332dbe0e removed all the necessary files from the project 2025-03-05 21:09:10 +09:00
dea770ee9f wait nvm this is the new copy of haesol 2025-03-05 21:01:27 +09:00
7c4bb831bf new copy of haesol with the new model 2025-03-05 21:00:39 +09:00
ec6b803adb animations and particles demo from haesol new model asset pack 2025-03-05 20:58:24 +09:00
a5d5a9fd3e blueprints for haesol new model 2025-03-05 20:56:16 +09:00
0c3cd7ab3a meshes for the girl model 2025-03-05 20:40:44 +09:00
3d2f3e88c6 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-05 20:28:23 +09:00
4f79e5a8d4 meshes for haesol 2025-03-05 20:13:40 +09:00
6c49be6280 materials for haesol model 2025-03-05 20:05:23 +09:00
3f6b68725d Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-05 20:02:00 +09:00
0c8829323c material functions and instances for haesol new model 2025-03-05 19:54:11 +09:00
e9a7f1bc2c more clothes related mask textures for haesol new model 2025-03-05 19:06:16 +09:00
0a17fb80f6 more textures for haesol new model 2025-03-05 19:05:45 +09:00
0e512b445a Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-05 15:32:25 +09:00
f96ea537fa Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-03-04 23:28:25 +09:00
b4f71c27b8 base textures for haesol new model 2025-03-04 23:20:52 +09:00
497f3f31a4 haesol new model wavy hair texture 2025-03-04 23:06:12 +09:00
54f7aff2d0 haesol new model straight hair texture 2025-03-04 23:05:37 +09:00
3264430bb2 Goblin Group Battle 2025-03-04 16:47:34 +09:00
baf7392373 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-02-28 21:13:12 +09:00
c4e2bb9ab6 bug fix 2025-02-28 21:13:05 +09:00
b9c1b7269b changed the timings of combos on the anim montages 2025-02-28 21:10:15 +09:00
6503a15916 nerfed sanin's projectil damage, buffed sanin's stack logic 2025-02-28 21:09:40 +09:00
5bf8426d88 gonginori 2025-02-28 12:50:03 +09:00
b420d87b72 attempted to fix the weird input consumption issues, but no solid improvements 2025-02-28 00:01:15 +09:00
5b3e5c3674 added the gonggi nori implementation to the original san-in blueprint 2025-02-28 00:00:31 +09:00
8461968ab4 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-02-27 21:36:53 +09:00
aff36733c6 sanin's melee attack technical alpha 2025-02-27 21:36:21 +09:00
276e16590e added logic for taking care of cancelling combo 2025-02-27 18:18:30 +09:00
9d6106ab4c adding the part that checks if the NPC is dead before setting the character combative 2025-02-27 17:47:46 +09:00
e6b443cf1f implement goblin group battle(Alpha) 2025-02-27 16:09:22 +09:00
1d8fb26b83 goblin group combat 2025-02-27 14:59:23 +09:00
e57fd047db some very minor changes for the two maps while testing the VFXs 2025-02-26 22:51:07 +09:00
da0ae7e07c added shockwave + emerging from the ground trail VFXs on sanin 2025-02-26 22:50:04 +09:00
08d0b66a75 debugging animation blueprints for goblin and sanin 2025-02-26 22:49:00 +09:00
df1e820ba5 niagara effects 2025-02-26 22:43:20 +09:00
34c344ffad assets for rock, stone vfx 2025-02-26 22:42:10 +09:00
b178e55e79 deleted the assets that are not used at all 2025-02-26 22:38:47 +09:00
0cb5fdfa98 vulnerability state added with some animation debug 2025-02-23 21:16:57 +09:00
e7ae8a7f0e Fmod Assets Re-Added 2025-02-21 23:35:07 -05:00
f9a0194149 conflict fixed 2025-02-22 12:10:06 +09:00
231bc1b8f5 conflict fixed 2025-02-22 12:05:25 +09:00
2a5fdd4700 conflict fixed 2025-02-22 12:03:18 +09:00
a6ea626c68 conflict fixed 2025-02-22 11:38:34 +09:00
46bb5b40d7 merge and conflict fix 2025-02-22 11:35:20 +09:00
ee99037e92 fixed the implementation after buggy merge for haesol passives and C skills 2025-02-22 11:33:19 +09:00
eb937fb3ad deleted the duplicate blueprint files for weapon mechanism and haesol 2025-02-22 10:02:18 +09:00
05e8cbd1e3 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-02-21 22:35:38 +09:00
ac52b1992f huge merge from haesol's ability branch 2025-02-21 21:14:29 +09:00
e2af4eacd5 map changes (no major changes that affects the current gameplay 2025-02-21 20:15:31 +09:00
3c9526d01f binaries that were missing on this branch + haesol's proj AOE skill halfway done 2025-02-21 00:42:56 +09:00
889f3e5aa2 what's wrong with git and this fmod documentation image i didn't touch anything here 2025-02-18 22:42:51 +09:00
f405d04ccd some config changes for the project 2025-02-18 21:35:14 +09:00
575119e19f added and deleted the test assets i used for haesol's C skill implementation 2025-02-18 21:34:33 +09:00
1ff6c2a4ba saving my implementation for haesol's C skill 2025-02-18 21:31:33 +09:00
d7a45525b1 added new blueprints responsible for changing the predicted projectile course for haesol's ability 2025-02-18 17:44:38 +09:00
13ed01c467 textures for archery vfx 2025-02-18 17:31:22 +09:00
5f729f6136 static meshes for archery vfx 2025-02-18 17:31:07 +09:00
c22b3f72df haesol's potential archery niagara vfx 2025-02-18 17:03:28 +09:00
59ba61ebe4 haesol's potential archery vfx materials 2025-02-18 17:03:01 +09:00
3396 changed files with 17210 additions and 4252 deletions

BIN
.DS_Store vendored

Binary file not shown.

13
.gitattributes vendored
View File

@ -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

94
.gitignore vendored
View File

@ -1,94 +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

View File

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

View File

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

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