• Joined on 2024-02-11
Shio pushed to main at neroberovero/Illusion-UE5 2024-11-14 02:01:08 +01:00
ac04661cd3 Merge branch 'fmod-integration'
c4ff36b0b3 Volume fix
fc8e43e57f Merge branch 'main' into fmod-integration
756e5f67ad shop logic in fmod
c7f841bfc3 Merge branch 'main' into fmod-integration
Compare 9 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-14 01:53:39 +01:00
c4ff36b0b3 Volume fix
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-14 01:36:17 +01:00
fc8e43e57f Merge branch 'main' into fmod-integration
a402f233ce Volume slider stuff
543b8b880f Merge remote-tracking branch 'origin/main'
de62c9ecfa implemented and applied custom cel-shader post-process shader to interactables and characters
bedd411254 repositioned the melee socket for haesol, created a custom vfx for sword trail, needs more parameter tuning for better results
Compare 6 commits »
Shio pushed to main at neroberovero/Illusion-UE5 2024-11-14 01:30:20 +01:00
a402f233ce Volume slider stuff
543b8b880f Merge remote-tracking branch 'origin/main'
a2fa5352ca Auto stash before merge of "main" and "origin/main"
Compare 3 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-13 23:10:14 +01:00
756e5f67ad shop logic in fmod
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-08 06:54:24 +01:00
c7f841bfc3 Merge branch 'main' into fmod-integration
a2fa5352ca Auto stash before merge of "main" and "origin/main"
503d43a479 added anim montage for staggering
5b4757e1f9 created decorators and tasks that abstract out the enemy base behaviors; also added animation assets for san-in
14c96727b4 more animation montages for san-in
Compare 16 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-08 06:51:59 +01:00
12ee19256c uhhh gotta push fmod png?
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-08 06:50:48 +01:00
b3794e381b Git ignore png pog
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-08 06:47:59 +01:00
f84e1cca43 Fmod uasset hot fix
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-11-08 06:43:18 +01:00
9ecfc40115 Raon stuff
Shio pushed to main at neroberovero/Illusion-UE5 2024-10-06 07:26:24 +02:00
0567a5e51b Merge branch 'fmod-integration'
db7dad84e9 Save/Crafting
884a29e097 Merge branch 'main' into fmod-integration
1d5762e49a push before merge
999bb75337 Combat Music
Compare 15 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-10-06 07:24:41 +02:00
db7dad84e9 Save/Crafting
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-10-06 07:00:51 +02:00
884a29e097 Merge branch 'main' into fmod-integration
1d5762e49a push before merge
1e28ace4be perception added to the AI controller
5879f32e77 re-configured gitattribtues
ba74f12c4f created new NPC c++ class
Compare 8 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-10-05 00:48:36 +02:00
999bb75337 Combat Music
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-10-04 21:22:27 +02:00
659e8a3975 test 3
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-10-04 21:13:28 +02:00
5289ae8363 Test 2
967bfe9d81 Asset test
Compare 2 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-10-04 19:49:29 +02:00
0c5e97cd70 Audio asset restructure/crafting and saving
09aec720b3 Merge branch 'main' into fmod-integration
564f2a80cd crafting system is fully functional
63d4092c2c level 1, block out started
cf526110b3 lmfao
Compare 57 commits »
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-09-25 22:55:35 +02:00
79a0aec027 make git happy
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-09-25 22:30:03 +02:00
d365ddd9f3 haesol and crafting fix
Shio pushed to fmod-integration at neroberovero/Illusion-UE5 2024-08-08 02:35:41 +02:00
56bf0a96a9 Merge?