benroshio
|
32ea3d2d49
|
Merge branch 'main' into fmod-integration
|
2024-06-12 20:01:16 -04:00 |
|
Ji Yoon Rhee
|
8b5c9a1f4b
|
still working on implementing the CheckForIntertactable(). the ui is buggy
|
2024-06-12 22:48:50 +09:00 |
|
Ji Yoon Rhee
|
ce82fffdda
|
implemented dashing on blueprints
|
2024-06-12 22:47:53 +09:00 |
|
benroshio
|
d9fdf4a0a7
|
Auto stash before merge of "fmod-integration" and "origin/fmod-integration"
|
2024-06-11 16:18:25 -04:00 |
|
benroshio
|
d5df643577
|
Merge remote-tracking branch 'origin/main' into fmod-integration
|
2024-06-11 16:07:25 -04:00 |
|
Ji Yoon Rhee
|
18abbad56d
|
changed some input-related code in player charac controller
|
2024-06-11 21:53:04 +09:00 |
|
Ji Yoon Rhee
|
917a1bb668
|
can toggle up inventory UI, can't tell if the input bindings for using item from inventory overlaps with that for normal melee attack
|
2024-06-11 21:52:34 +09:00 |
|
Ji Yoon Rhee
|
68d9fafdf6
|
added input action reference for walking, binded IA_Walk to Move() function
|
2024-06-10 18:41:00 +09:00 |
|
Ji Yoon Rhee
|
06bb51a198
|
binded input actions for walking and jogging for haesol
|
2024-06-10 18:40:12 +09:00 |
|
benroshio
|
d4fbc87b5a
|
Merge remote-tracking branch 'origin/main' into fmod-integration
|
2024-06-09 16:20:22 -04:00 |
|
Ji Yoon Rhee
|
264db39cc1
|
included the input mapping contexts to character.cpp and playercharaccontroller.cpp. need to replace the interact to character
|
2024-06-09 22:25:09 +09:00 |
|
Ji Yoon Rhee
|
c956bf2978
|
added death event, stance variable to character blueprint
|
2024-06-09 22:23:51 +09:00 |
|
Ji Yoon Rhee
|
1b515981f5
|
created input mapping context for projectile attacks and UI toggling
|
2024-06-08 23:27:33 +09:00 |
|
Ji Yoon Rhee
|
d51ec24938
|
set up input mapping in hwanyoung2 character
|
2024-06-08 23:26:38 +09:00 |
|
Ji Yoon Rhee
|
cf35258254
|
added anim bp and base character bp
|
2024-06-08 08:25:27 +09:00 |
|
benroshio
|
5249fa75b6
|
Merge remote-tracking branch 'origin/main' into fmod-integration
|
2024-06-05 11:58:43 -04:00 |
|
Ji Yoon Rhee
|
d69e46553f
|
visual effect assets
|
2024-06-01 12:49:36 +09:00 |
|
Ji Yoon Rhee
|
4e5f371b49
|
add blueprints for HP system, assets, and MP system
|
2024-06-01 09:30:13 +09:00 |
|
Ji Yoon Rhee
|
c03b8968e1
|
deleted off unnecessary, conflicting files in our solution file
|
2024-06-01 09:29:00 +09:00 |
|
Ji Yoon Rhee
|
87c47a72e3
|
commit
|
2024-05-25 08:07:59 +09:00 |
|
benroshio
|
2d873057cf
|
New Combat assets and menu
|
2024-05-24 18:52:22 -04:00 |
|
benroshio
|
2c35bd3e1a
|
Music yo
More Fmod setup abient tracks added
|
2024-04-12 17:07:31 -04:00 |
|
benroshio
|
664e26d786
|
UI Setup
|
2024-04-08 23:37:15 -04:00 |
|
benroshio
|
eda6879933
|
Main Merge
|
2024-04-08 21:26:44 -04:00 |
|
Ji Yoon Rhee
|
c5f825f16d
|
committing for now
|
2024-03-29 19:50:16 -04:00 |
|
KenHen
|
2408ece0ad
|
hi
|
2024-03-22 19:33:09 -04:00 |
|
KenHen
|
074d3100b9
|
lmao
|
2024-03-22 19:28:21 -04:00 |
|
Ji Yoon Rhee
|
1b20057b1e
|
bruh moment
|
2024-03-22 19:27:32 -04:00 |
|
KenHen
|
adc0ca2f3f
|
???
|
2024-03-22 19:26:06 -04:00 |
|
KenHen
|
be35a3e235
|
idk2
|
2024-03-22 19:20:36 -04:00 |
|
KenHen
|
1315c911a1
|
idk
|
2024-03-22 19:20:09 -04:00 |
|
KenHen
|
91b3c4c013
|
bruh moment 84
|
2024-03-22 19:19:23 -04:00 |
|
benroshio
|
6c5b66537c
|
Fix Fmod Maybe???
|
2024-03-22 19:17:26 -04:00 |
|
Ji Yoon Rhee
|
c6e0e40fc6
|
uh
|
2024-03-22 19:04:53 -04:00 |
|
sharon2pan
|
b35977e4cc
|
bruh moment pt.3
|
2024-03-22 18:35:08 -04:00 |
|
Ji Yoon Rhee
|
5bb52e3748
|
getting rid of .dll
|
2024-03-22 18:20:41 -04:00 |
|
Ji Yoon Rhee
|
3cca1ed901
|
committing before fixing branch issue
|
2024-03-22 18:05:03 -04:00 |
|
benroshio
|
9096ce0d50
|
FMOD integration completed
|
2024-02-25 19:30:18 -05:00 |
|
Ji Yoon Rhee
|
0e4fd6a175
|
bruh moment?
|
2024-02-25 17:46:42 -05:00 |
|
benroshio
|
34eac95019
|
Merge branch 'Fmod-2' into fmod-integration
|
2024-02-11 15:44:52 -05:00 |
|
benroshio
|
3af569d9b9
|
set up pt 1
|
2024-02-11 15:37:54 -05:00 |
|
Ji Yoon Rhee
|
2c8481bd61
|
fixed issue
|
2024-02-10 17:06:19 -05:00 |
|
Ji Yoon Rhee
|
b045551102
|
Revert "let's try this"
This reverts commit 40f878afd6.
|
2024-02-09 21:22:08 -05:00 |
|
Ji Yoon Rhee
|
40f878afd6
|
let's try this
|
2024-02-09 21:18:49 -05:00 |
|
Ji Yoon Rhee
|
0e42abd151
|
Revert "mmm"
This reverts commit c07d621e9b.
|
2024-02-09 21:17:46 -05:00 |
|
Ji Yoon Rhee
|
e4cac75ecf
|
init commit
|
2024-02-09 18:48:56 -05:00 |
|
Ji Yoon Rhee
|
c07d621e9b
|
mmm
|
2024-02-09 18:46:44 -05:00 |
|
Ji Yoon Rhee
|
368bbfd2a8
|
abstract weapon class
|
2024-02-02 19:55:36 -05:00 |
|
Ji Yoon Rhee
|
76cd581ed0
|
Merge branch 'angela-inventory' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 into angela-inventory
|
2024-01-04 23:04:20 +09:00 |
|
Ji Yoon Rhee
|
191cd0dbdd
|
accidentally fixed the bug for camera component not being properly placed in-game; will need to fine tune the numbers next
|
2024-01-04 23:03:39 +09:00 |
|