Commit Graph

152 Commits

Author SHA1 Message Date
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
f5334fe65a Merge branch 'main' into angela-inventory 2024-01-02 09:39:23 +01:00
Ji Yoon Rhee
586a7cf134 attempted to do comment documentations, got distracted, will do this later 2024-01-01 23:39:18 +09:00
Ji Yoon Rhee
b9c0b0f94b data table added for future use of inventory 2024-01-01 23:04:54 +09:00
Ji Yoon Rhee
76d375aae5 major inventory system scripting job done, now onto creating blueprints, input action, and working on the GUI 2024-01-01 21:54:48 +09:00
Ji Yoon Rhee
b7a583ab27 some more progress to inventory system 2023-12-27 20:29:00 +09:00
Ji Yoon Rhee
90d6e5af17 did some work on the inventory item 2023-12-26 23:49:01 +09:00
Ji Yoon Rhee
ce5240bfd9 i'm losing my mind wtf is this 2023-12-26 23:33:12 +09:00
Ji Yoon Rhee
6235bcb85c idk if i'm doing this correctly bro please help me lord 2023-12-25 16:47:15 +09:00
Ji Yoon Rhee
36bcb08c75 in the middle of implementing the controller 2023-11-27 19:22:22 -05:00
0b19a3bdfe Merge pull request 'angela-inventory' (#1) from angela-inventory into main
Reviewed-on: #1
2023-10-17 02:51:21 +02:00
Ji Yoon Rhee
d91c59aa5c halfway worked on Interactables...handing off to Ken 2023-10-16 20:50:21 -04:00
Ji Yoon Rhee
2fb7b538df interactables, game state 2023-10-15 21:18:31 -04:00
Ji Yoon Rhee
0abfca2e0c test commit for branch 2023-10-15 19:38:15 -04:00
panharathsok3
d2850b4258 test 2023-10-14 21:39:29 -04:00
Ji Yoon Rhee
b5035aed79 experimenting with fixing .uproject association issue 2023-10-10 02:00:48 -04:00
Ji Yoon Rhee
5665ec9a00 disabling a plugin 2023-10-09 20:12:04 -04:00
Ji Yoon Rhee
01555c3ccf initial stuff hopefully this works 2023-10-09 19:37:22 -04:00
c1910ab988 Update 'README.md' 2023-09-26 00:57:19 +02:00