Merge branch 'fmod-integration'

This commit is contained in:
benroshio 2024-10-06 01:25:52 -04:00
commit 0567a5e51b
138 changed files with 3019 additions and 89 deletions

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

View 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>

View File

@ -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>

View File

@ -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>

View File

@ -13,7 +13,7 @@
<value>Event Editor 1</value> <value>Event Editor 1</value>
</property> </property>
<property name="windowLayout"> <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> </property>
<relationship name="activePlatform"> <relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination> <destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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