neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: neroberovero:main
Branches Tags
neroberovero:main
neroberovero:Chaz
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3
...
pull from: neroberovero:Fmod-Intergration-V2
Branches Tags
neroberovero:main
neroberovero:Chaz
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3

1 Commits
main ... Fmod-Inter

Author SHA1 Message Date
benroshio
e22942f7e4 Revert "push before merge" 
This reverts commit dafcf19ad4b296ecfc69cef996ed3dcee55cd68c.
 2025-04-24 00:42:31 -04:00
38 changed files with 15 additions and 25 deletions
Show Stats Expand all files Collapse all files

BIN
hwanyoung2/Content/FMOD/Desktop/Master.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/ABP_Haesol1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1CA6CC10.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2BE87DD4.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2CBF1416.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/46CD53C6.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5033A088.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/71B27784.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B59CCC19.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CD803ABE.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E69665D7.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/EF371689.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F6958427.fobj
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{14837715-a9d5-4db7-b6f1-a43d0e9e453c}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{32fb788c-9449-4ab8-afb8-4565e44c1877}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{77947158-2d26-4632-97d4-48b1fb13eff9}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{c907e405-b074-4509-a611-e558b6236d99}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{d6fa3d66-6061-46d9-a4a9-b2b12b49d71b}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{eb42c67b-328e-4f48-9cf4-86f7f8606e26}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{f08f8278-b9e0-4c6e-adb2-26d38eb751d4}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{f4661c20-951a-4c8b-8886-b59aba783988}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{f48ef6b7-3953-4d2f-9430-de1d318a7cc7}.pdc
View File

Binary file not shown.

2
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
View File

@ -13,7 +13,7 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///6lgAAAJL///8lAAADgf//+pcAAACx////JAAAA4AAAAABAAAAAAeA///6lwAAALH///8kAAADgAAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+7IAAACU////0QAAA4IAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

2
hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml
View File

@ -13,7 +13,7 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///6lgAAAJL///8lAAADgf//+pcAAACx////JAAAA4AAAAABAAAAAAeA///6lwAAALH///8kAAADgAAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+7IAAACU////0QAAA4IAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

6
hwanyoung2/Content/Illusions/Metadata/Event/{79853392-663d-492e-905d-fdf5f27009e8}.xml
View File

@ -56,11 +56,7 @@
<destination>{93fb17f3-d0a1-44d7-b7e3-9f060d84622a}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{f35d5548-f9b3-45f8-be48-19d78423b626}">
<property name="maximumDistance">
<value>200</value>
</property>
</object>
<object class="EventAutomatableProperties" id="{f35d5548-f9b3-45f8-be48-19d78423b626}" />
<object class="MarkerTrack" id="{5fe8a501-1cdc-4491-be9b-ffb3286183e6}" />
<object class="GroupTrack" id="{5ebb2df9-41d2-4c51-919a-322e37175abc}">
<relationship name="modules">

12
hwanyoung2/Content/Illusions/Metadata/Event/{ecaf67a9-594f-4554-9441-a2e83da01941}.xml
View File

@ -118,9 +118,6 @@
</relationship>
</object>
<object class="EventMixerGroup" id="{c534fed0-9e1a-4596-b51c-732d3da20085}">
<property name="volume">
<value>-6.5</value>
</property>
<property name="name">
<value>Audio 1</value>
</property>
@ -167,13 +164,16 @@
</relationship>
</object>
<object class="SingleSound" id="{06bd91c0-1045-437b-bb2d-0a371a31d753}">
<property name="volume">
<value>-11</value>
</property>
<relationship name="audioFile">
<destination>{f4661c20-951a-4c8b-8886-b59aba783988}</destination>
</relationship>
</object>
<object class="SingleSound" id="{350fb2a5-bb08-40d3-a3be-7ea683fa2bf5}">
<property name="volume">
<value>-3.5</value>
<value>-13.5</value>
</property>
<relationship name="audioFile">
<destination>{f08f8278-b9e0-4c6e-adb2-26d38eb751d4}</destination>
@ -189,7 +189,7 @@
</object>
<object class="SingleSound" id="{ad7b4967-02e0-44b9-8629-ce6449861aeb}">
<property name="volume">
<value>-6</value>
<value>-14</value>
</property>
<relationship name="audioFile">
<destination>{77947158-2d26-4632-97d4-48b1fb13eff9}</destination>
@ -197,7 +197,7 @@
</object>
<object class="SingleSound" id="{fabdb011-5b6b-44dc-b748-9ed8a19671dd}">
<property name="volume">
<value>-2.5</value>
<value>-11</value>
</property>
<relationship name="audioFile">
<destination>{f4661c20-951a-4c8b-8886-b59aba783988}</destination>

BIN
hwanyoung2/Intermediate/ReimportCache/3688439234.bin
View File

Binary file not shown.