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

Compare commits

base: neroberovero:4f87f954b94ca7b32d3deb425d2d3532f20f3a79
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
..
compare: neroberovero:9329fd919be92493207b3e474c53774fba185382
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

No commits in common. "4f87f954b94ca7b32d3deb425d2d3532f20f3a79" and "9329fd919be92493207b3e474c53774fba185382" have entirely different histories.
4f87f954b9 ... 9329fd919b

60 changed files with 14 additions and 1638 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/FMOD/Desktop/Master.strings.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/Music/Bunny_Puzzle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.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/00E19116.fobj
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{39497745-b64e-4d28-aac7-4c478a8d1d54}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{719fbb29-49b4-4219-9d9d-ad3e23bbd93b}.pdc
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{bf5bc1f2-b8bd-4036-a348-9f690b9f3dc2}.pdc
View File

Binary file not shown.

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

@ -2,22 +2,22 @@
<objects serializationModel="Studio.02.02.00">
<object class="Workspace" id="{7566e94e-8228-4fb9-ac5e-6a0103d5bf81}">
<relationship name="projectSettings">
<destination>{f179b5e9-b81a-4484-9db4-c7129a966fbb}</destination>
<destination>{c4679206-f633-40ee-b9c6-4a93d89e762e}</destination>
</relationship>
<relationship name="changelist">
<destination>{7c418852-d02f-4cfe-be46-0d0c48539ebf}</destination>
<destination>{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}</destination>
</relationship>
</object>
<object class="ProjectSettings" id="{f179b5e9-b81a-4484-9db4-c7129a966fbb}">
<object class="ProjectSettings" id="{c4679206-f633-40ee-b9c6-4a93d89e762e}">
<property name="openWindows">
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAAAQAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAGkAAAJXAAAEiAAAA/oAAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdw==</value>
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
</relationship>
</object>
<object class="WorkspaceChangelist" id="{7c418852-d02f-4cfe-be46-0d0c48539ebf}" />
<object class="WorkspaceChangelist" id="{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}" />
</objects>

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

@ -2,22 +2,22 @@
<objects serializationModel="Studio.02.02.00">
<object class="Workspace" id="{7566e94e-8228-4fb9-ac5e-6a0103d5bf81}">
<relationship name="projectSettings">
<destination>{f179b5e9-b81a-4484-9db4-c7129a966fbb}</destination>
<destination>{c4679206-f633-40ee-b9c6-4a93d89e762e}</destination>
</relationship>
<relationship name="changelist">
<destination>{7c418852-d02f-4cfe-be46-0d0c48539ebf}</destination>
<destination>{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}</destination>
</relationship>
</object>
<object class="ProjectSettings" id="{f179b5e9-b81a-4484-9db4-c7129a966fbb}">
<object class="ProjectSettings" id="{c4679206-f633-40ee-b9c6-4a93d89e762e}">
<property name="openWindows">
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAAAQAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAGkAAAJXAAAEiAAAA/oAAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdw==</value>
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
</relationship>
</object>
<object class="WorkspaceChangelist" id="{7c418852-d02f-4cfe-be46-0d0c48539ebf}" />
<object class="WorkspaceChangelist" id="{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}" />
</objects>

BIN
hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.ogg
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.ogg
View File

Binary file not shown.

23
hwanyoung2/Content/Illusions/Metadata/AudioFile/{6ec4bc32-6d70-491c-9034-5782702c03bd}.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="AudioFile" id="{6ec4bc32-6d70-491c-9034-5782702c03bd}">
<property name="assetPath">
<value>Music/raon shop.wav</value>
</property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>55.384625</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

23
hwanyoung2/Content/Illusions/Metadata/AudioFile/{719fbb29-49b4-4219-9d9d-ad3e23bbd93b}.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="AudioFile" id="{719fbb29-49b4-4219-9d9d-ad3e23bbd93b}">
<property name="assetPath">
<value>Music/BunnyPuzzle_Mix_ending.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>85</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

23
hwanyoung2/Content/Illusions/Metadata/AudioFile/{bf5bc1f2-b8bd-4036-a348-9f690b9f3dc2}.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="AudioFile" id="{bf5bc1f2-b8bd-4036-a348-9f690b9f3dc2}">
<property name="assetPath">
<value>Music/BunnyPuzzle_Mix_2.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>85</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

1514
hwanyoung2/Content/Illusions/Metadata/Event/{2b515270-5798-4ee9-adc2-eebb2b8ee312}.xml
View File

File diff suppressed because it is too large Load Diff

35
hwanyoung2/Content/Illusions/Metadata/ParameterPreset/{a5dda024-1b4a-4b67-a1e1-15f909999e8e}.xml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="ParameterPreset" id="{a5dda024-1b4a-4b67-a1e1-15f909999e8e}">
<property name="name">
<value>Bunny puzzle ending</value>
</property>
<relationship name="folder">
<destination>{18af223d-abd8-4074-9e25-0c1698cedc53}</destination>
</relationship>
<relationship name="parameter">
<destination>{23aa9f33-1c34-49d8-8f73-f671ab0ddad4}</destination>
</relationship>
</object>
<object class="GameParameter" id="{23aa9f33-1c34-49d8-8f73-f671ab0ddad4}">
<property name="parameterType">
<value>2</value>
</property>
<property name="maximum">
<value>2</value>
</property>
<property name="enumerationLabels">
<value>Value A</value>
<value>End</value>
</property>
<property name="isGlobal">
<value>true</value>
</property>
<property name="initialValue">
<value>0</value>
</property>
<property name="isExposedRecursively">
<value>false</value>
</property>
</object>
</objects>

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

Binary file not shown.