7heIVIaze
|
231bc1b8f5
|
conflict fixed
|
2025-02-22 12:05:25 +09:00 |
|
7heIVIaze
|
2a5fdd4700
|
conflict fixed
|
2025-02-22 12:03:18 +09:00 |
|
7heIVIaze
|
a6ea626c68
|
conflict fixed
|
2025-02-22 11:38:34 +09:00 |
|
7heIVIaze
|
46bb5b40d7
|
merge and conflict fix
|
2025-02-22 11:35:20 +09:00 |
|
Ji Yoon Rhee
|
ee99037e92
|
fixed the implementation after buggy merge for haesol passives and C skills
|
2025-02-22 11:33:19 +09:00 |
|
Ji Yoon Rhee
|
eb937fb3ad
|
deleted the duplicate blueprint files for weapon mechanism and haesol
|
2025-02-22 10:02:18 +09:00 |
|
7heIVIaze
|
05e8cbd1e3
|
Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5
|
2025-02-21 22:35:38 +09:00 |
|
Ji Yoon Rhee
|
ac52b1992f
|
huge merge from haesol's ability branch
|
2025-02-21 21:14:29 +09:00 |
|
Ji Yoon Rhee
|
e2af4eacd5
|
map changes (no major changes that affects the current gameplay
|
2025-02-21 20:15:31 +09:00 |
|
7heIVIaze
|
0195b2059d
|
pull and parry implementation
|
2025-02-21 10:15:31 +09:00 |
|
7heIVIaze
|
2b96c6c864
|
Parry Implementation
|
2025-02-21 10:12:22 +09:00 |
|
7heIVIaze
|
67ddcc4249
|
Parry Implementation
|
2025-02-21 09:54:32 +09:00 |
|
Ji Yoon Rhee
|
3c9526d01f
|
binaries that were missing on this branch + haesol's proj AOE skill halfway done
|
2025-02-21 00:42:56 +09:00 |
|
Ji Yoon Rhee
|
1764c961eb
|
some clean up of the code, but no changes in the implementation itself
|
2025-02-18 22:04:26 +09:00 |
|
Ji Yoon Rhee
|
575119e19f
|
added and deleted the test assets i used for haesol's C skill implementation
|
2025-02-18 21:34:33 +09:00 |
|
Ji Yoon Rhee
|
1ff6c2a4ba
|
saving my implementation for haesol's C skill
|
2025-02-18 21:31:33 +09:00 |
|
7heIVIaze
|
2335f42e1e
|
Implement Haesol's Passive Skill
|
2025-02-18 21:19:52 +09:00 |
|
Ji Yoon Rhee
|
d7a45525b1
|
added new blueprints responsible for changing the predicted projectile course for haesol's ability
|
2025-02-18 17:44:38 +09:00 |
|
Ji Yoon Rhee
|
13ed01c467
|
textures for archery vfx
|
2025-02-18 17:31:22 +09:00 |
|
Ji Yoon Rhee
|
5f729f6136
|
static meshes for archery vfx
|
2025-02-18 17:31:07 +09:00 |
|
Ji Yoon Rhee
|
c22b3f72df
|
haesol's potential archery niagara vfx
|
2025-02-18 17:03:28 +09:00 |
|
Ji Yoon Rhee
|
59ba61ebe4
|
haesol's potential archery vfx materials
|
2025-02-18 17:03:01 +09:00 |
|
7heIVIaze
|
627dd7e0b4
|
implement haesol's passive
|
2025-02-17 17:16:49 +09:00 |
|
7heIVIaze
|
a1577404f7
|
Implement Haesol's Passive Skill
|
2025-02-17 16:06:53 +09:00 |
|
Ji Yoon Rhee
|
649fcc81af
|
added the low HP HUD overlay to player HUD
|
2025-02-11 17:30:50 +09:00 |
|
Ji Yoon Rhee
|
e430feb2e0
|
forgot to add this one haha
|
2025-02-09 19:44:55 +09:00 |
|
Ji Yoon Rhee
|
13d78f25fc
|
more nanite setting changes for more environmental assets
|
2025-02-09 19:44:27 +09:00 |
|
Ji Yoon Rhee
|
f98ba50e72
|
added the sfx for haesol's skill cooldown timer
|
2025-02-09 19:43:49 +09:00 |
|
Ji Yoon Rhee
|
31ca5ef14d
|
enabled nanite settings for the environment meshes for rendering optimization
|
2025-02-09 19:40:29 +09:00 |
|
Ji Yoon Rhee
|
cff82b376f
|
modified the arrow to be stuck to an object more realistically
|
2025-02-08 22:55:39 +09:00 |
|
Ji Yoon Rhee
|
60bc0836ed
|
had to delete my old files so that i can fix the merge conflicts on my end
|
2025-02-08 22:54:14 +09:00 |
|
Ji Yoon Rhee
|
e55fabd3b4
|
added the damage implementation to the arrows
|
2025-02-08 13:05:58 +09:00 |
|
benroshio
|
2cb52e12d0
|
Auto stash before merge of "main" and "origin/main"
|
2025-02-04 17:26:56 -05:00 |
|
Ji Yoon Rhee
|
f46716de6b
|
added some items to test the new item functionality on the spring level
|
2025-02-04 12:33:13 +09:00 |
|
Ji Yoon Rhee
|
34b23d8a3c
|
oops i forgot to add the changed item data base to the previous commit
|
2025-02-04 12:19:48 +09:00 |
|
Ji Yoon Rhee
|
a01b94d8ac
|
changed the item ID to match the IDs included in the item data base
|
2025-02-04 12:18:57 +09:00 |
|
Ji Yoon Rhee
|
d8146a9b3b
|
some ignored files ar ebeing pushed rn
|
2025-02-03 23:22:54 +09:00 |
|
Ji Yoon Rhee
|
9faf77cc5a
|
deleted unnecessary demo map file, some minor changes for spring levels
|
2025-02-03 23:16:56 +09:00 |
|
Ji Yoon Rhee
|
a48f6238c3
|
some post-source compile debugging for UI elements
|
2025-02-03 23:16:13 +09:00 |
|
Ji Yoon Rhee
|
38fcae1630
|
assets for new food/craftable items
|
2025-02-03 23:14:02 +09:00 |
|
Ji Yoon Rhee
|
cdd5f7f67a
|
debugging for inventory system
|
2025-02-03 23:12:46 +09:00 |
|
Ji Yoon Rhee
|
15f41865fa
|
new items, but they are buggy
|
2025-02-03 00:40:12 +09:00 |
|
Ji Yoon Rhee
|
9b2088f621
|
new item assets to work with
|
2025-02-03 00:23:28 +09:00 |
|
Ji Yoon Rhee
|
9cc4991e88
|
necessary edits for migration
|
2025-02-02 00:36:42 +09:00 |
|
Ji Yoon Rhee
|
38b2151bb3
|
tried to solve merge conflicts with the thing
|
2025-02-02 00:15:55 +09:00 |
|
benroshio
|
7077da1397
|
FMOD Bow and Sword fix
|
2025-01-23 00:06:21 -05:00 |
|
benroshio
|
199476d607
|
FMOD sword sounds
|
2025-01-22 21:07:44 -05:00 |
|
Ji Yoon Rhee
|
a5a5949153
|
added the fmod event for bow draw + release sfx
|
2025-01-22 10:08:44 +09:00 |
|
Ji Yoon Rhee
|
c7e3a23400
|
some changes for player HUD and crosshair
|
2025-01-19 23:48:33 +09:00 |
|
Ji Yoon Rhee
|
650711df87
|
added interface functions for adding/using ultimate points
|
2025-01-19 23:48:12 +09:00 |
|