Merge branch 'fmod-integration'
This commit is contained in:
benroshio
commit
0567a5e51b
hwanyoung2/Content
FMOD
Desktop
Events/SFX
PrivateIntegrationData
Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations
Illusions
.cache
buildrecords/Desktop
fsbcache/Desktop
06B87BAF.fobj096B525D.fobj0FB823D7.fobj149C3284.fobj1AF106A3.fobj2004891E.fobj201E4613.fobj2881015A.fobj28B7D62D.fobj34D03CE4.fobj36DA31F4.fobj37437A1C.fobj3B3A2686.fobj3B6DFBE6.fobj3F0FF70F.fobj440B76EC.fobj4BA9D511.fobj52FABF29.fobj5602122D.fobj579E86B8.fobj66424FCB.fobj6759C61E.fobj844579F9.fobj86508BF1.fobj8FE24A2E.fobjA14AAF50.fobjAF54786B.fobjB3B1611D.fobjC3DFB20F.fobjCDFEED0D.fobjD057BDEE.fobjD3A4D7C2.fobjD6456ED1.fobjD80849B6.fobjDE0696AE.fobjEC829F09.fobjF260DD1F.fobjFB0F4352.fobjFF85EBC7.fobj
{097fe95c-fbd5-4a8c-8be8-7c452d9fc2fc}.pdc{0e37adfa-589d-4463-9664-761a12aa1bf0}.pdc{1f006aa4-2ede-44e7-888d-12cfc0bd0ffd}.pdc{206c79e5-ec8d-4525-9313-2c48b41de8c0}.pdc{260c9658-5b87-40a9-96df-4e718e990294}.pdc{2e604db7-d09e-4bb6-9165-22d35428ca82}.pdc{30b14116-1f37-44dd-b072-d31963ed1eed}.pdc{31437fc8-7765-4622-a0a9-08faa249a083}.pdc{32fb788c-9449-4ab8-afb8-4565e44c1877}.pdc{35250175-caa9-4d8d-aa28-1720b27d2ff6}.pdc{366c9ccd-d27d-4b41-8ccf-79d7456c803d}.pdc{3a0897f4-a788-4455-9058-8c78a5561c80}.pdc{3c774eac-9d3b-419a-b1c5-15aadbbc1d07}.pdc{40d46784-a42e-4a3a-88ab-a45f836f675a}.pdc{4510bcc5-5516-4662-a0e3-ab074499c616}.pdc{47959e1d-4582-4123-b548-3ac47803c174}.pdc{51361f47-1071-42dd-9436-2338965081ac}.pdc{63bbab8f-89ae-4070-8561-ce963b5caab0}.pdc{7b495f40-63ad-479f-a09b-9139ad95820d}.pdc{8770041c-8837-4458-92cd-c7b6772bdf3c}.pdc{8e048db8-e707-4f0e-bf23-3e587af8923a}.pdc{93c03764-53e6-4ec1-909e-7e40bcb9e4d2}.pdc{9820f82b-6992-4d9e-8447-04f30bc25f8c}.pdc{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc{9e61281a-b5a7-4f9c-8a85-63ba09d9130e}.pdc{b8e21bc7-d616-4b96-92c6-a530ba132823}.pdc{b960fcfb-213c-401d-8405-4938933d5731}.pdc{b987dc57-a718-4556-a1f8-79f606a0b33e}.pdc{bc128fa6-b281-48f3-9572-c2b54da201a3}.pdc{d29c51b2-d6ae-457d-a606-c327b625234b}.pdc{d2a34bdb-96ac-400d-8402-858a7420007e}.pdc{dbdf0633-d22b-4d14-a967-34499bb707bf}.pdc{e0d2d86f-3ebd-4d9c-a3e6-6d295e358587}.pdc{e179ef98-764a-481e-a25e-a04e091a27b7}.pdc{efa740e5-6b1c-4323-9d23-602cbfb915e7}.pdc{f43340c1-4fe1-4ded-a92e-ef503792b06e}.pdc{f449472d-716c-452f-b0b0-ea5c697584e7}.pdc{f4896469-515b-40e7-8026-d2b4c2f68304}.pdc.unsaved/.user/Metadata
.user/Metadata
Assets/Combat
Binary file not shown.
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Sword_Block_Redy.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Sword_Block_Redy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/Craft_open.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/Craft_open.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/Crafting.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/Crafting.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolBlockHold.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolBlockHold.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
Normal file
4
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
|
||||
</objects>
|
||||
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
|
||||
</objects>
|
||||
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="Workspace" id="{7566e94e-8228-4fb9-ac5e-6a0103d5bf81}">
|
||||
<relationship name="projectSettings">
|
||||
<destination>{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}</destination>
|
||||
</relationship>
|
||||
<relationship name="changelist">
|
||||
<destination>{c81ff576-a715-479d-877b-e0a0201464b5}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="ProjectSettings" id="{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}">
|
||||
<property name="openWindows">
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<value>AAAABwAAACAAUAByAGUAcwBlAHQAIABCAHIAbwB3AHMAZQByACAAMQAAAEIB2dDLAAMAAAAAAvcAAACBAAAEiAAAA3AAAAL4AAAAoAAABIcAAANvAAAAAAAAAAAHgAAAAvgAAACgAAAEhwAAA28AAAAeAE0AaQB4AGUAcgAgAFIAbwB1AHQAaQBuAGcAIAAxAAAAQgHZ0MsAAwAAAAAENwAAATUAAAXIAAAEJAAABDgAAAFUAAAFxwAABCMAAAAAAAAAAAoAAAAEOAAAAVQAAAXHAAAEIwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+Q8AAAAP///9ngAAA+7///kQAAAALv///Z0AAAPtAAAAAQAAAAAHgP//+RAAAAAu///9nQAAA+0AAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAJ/AAAA+QAABw4AAAPoAAACgAAAARgAAAcNAAAD5wAAAAAAAAAAB4AAAAKAAAABGAAABw0AAAPnAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADIAAABCAdnQywADAAD/////////+AAAB4AAAAQQAAACJwAAASgAAAZGAAACywAAAAACAAAAB4AAAAAAAAAAFwAAB38AAAQPAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAd/////+AAAEYAAAAV4AAAL3QAAAbIAAA/8AAADVQAAAAECAAAACgAAAAeAAAAAFwAAEX8AAAV3AAAAHgBFAHYAZQBuAHQAIABCAHIAbwB3AHMAZQByACAAMQAAAEIB2dDLAAMAAP//+3gAAACB///9CQAAA3D///t5AAAAoP///QgAAANvAAAAAQAAAAAHgP//+3kAAACg///9CAAAA28=</value>
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="WorkspaceChangelist" id="{c81ff576-a715-479d-877b-e0a0201464b5}" />
|
||||
</objects>
|
||||
@ -13,7 +13,7 @@
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<value>AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAA///5DwAAAA////2eAAAD7v//+RAAAAAu///9nQAAA+0AAAABAAAAAAeA///5EAAAAC7///2dAAAD7QAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAAASkAAAFuAAAFuAAABU0AAAEqAAABjQAABbcAAAVMAAAAAAAAAAAKAAAAASoAAAGNAAAFtwAABUwAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMfAAABOwAABz4AAAR+AAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw==</value>
|
||||
<value>AAAABwAAACAAUAByAGUAcwBlAHQAIABCAHIAbwB3AHMAZQByACAAMQAAAEIB2dDLAAMAAAAAAvcAAACBAAAEiAAAA3AAAAL4AAAAoAAABIcAAANvAAAAAAAAAAAHgAAAAvgAAACgAAAEhwAAA28AAAAeAE0AaQB4AGUAcgAgAFIAbwB1AHQAaQBuAGcAIAAxAAAAQgHZ0MsAAwAAAAAENwAAATUAAAXIAAAEJAAABDgAAAFUAAAFxwAABCMAAAAAAAAAAAoAAAAEOAAAAVQAAAXHAAAEIwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+Q8AAAAP///9ngAAA+7///kQAAAALv///Z0AAAPtAAAAAQAAAAAHgP//+RAAAAAu///9nQAAA+0AAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAJ/AAAA+QAABw4AAAPoAAACgAAAARgAAAcNAAAD5wAAAAAAAAAAB4AAAAKAAAABGAAABw0AAAPnAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADIAAABCAdnQywADAAD/////////+AAAB4AAAAQQAAACJwAAASgAAAZGAAACywAAAAACAAAAB4AAAAAAAAAAFwAAB38AAAQPAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAd/////+AAAEYAAAAV4AAAL3QAAAbIAAA/8AAADVQAAAAECAAAACgAAAAeAAAAAFwAAEX8AAAV3AAAAHgBFAHYAZQBuAHQAIABCAHIAbwB3AHMAZQByACAAMQAAAEIB2dDLAAMAAP//+3gAAACB///9CQAAA3D///t5AAAAoP///QgAAANvAAAAAQAAAAAHgP//+3kAAACg///9CAAAA28=</value>
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
|
||||
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Buff_Haesol.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Buff_Haesol.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Creak_1.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Creak_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Creak_2.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Creak_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Sword_block_2.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Sword_block_2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail3.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail3.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail_version_4.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail_version_4.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/bow_string.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Illusions/Assets/Combat/bow_string.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user