Compare commits

...

9 Commits

Author SHA1 Message Date
benroshio
ac04661cd3 Merge branch 'fmod-integration' 2024-11-13 20:00:44 -05:00
benroshio
c4ff36b0b3 Volume fix 2024-11-13 19:52:57 -05:00
benroshio
fc8e43e57f Merge branch 'main' into fmod-integration 2024-11-13 19:35:48 -05:00
benroshio
756e5f67ad shop logic in fmod 2024-11-13 17:08:45 -05:00
benroshio
c7f841bfc3 Merge branch 'main' into fmod-integration 2024-11-08 00:54:08 -05:00
benroshio
12ee19256c uhhh gotta push fmod png?
we gotta fix the git ignore frfr
2024-11-08 00:51:50 -05:00
benroshio
b3794e381b Git ignore png pog 2024-11-08 00:50:42 -05:00
benroshio
f84e1cca43 Fmod uasset hot fix 2024-11-08 00:47:48 -05:00
benroshio
9ecfc40115 Raon stuff 2024-11-04 16:43:27 -05:00
32 changed files with 62 additions and 85 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +0,0 @@
<?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

@ -1,4 +0,0 @@
<?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

@ -13,7 +13,7 @@
<value>Mixer 1</value> <value>Mixer 1</value>
</property> </property>
<property name="windowLayout"> <property name="windowLayout">
<value>AAAACAAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAHgAAABBAAAAGhAAAAGgAABcAAAAG9AAAAAAIAAAAHgAAAAAAAAAAXAAAHfwAABA8AAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAD///kPAAAAD////Z4AAAPu///5EAAAAC7///2dAAAD7QAAAAEAAAAAB4D///kQAAAALv///Z0AAAPtAAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEEP//+s8AAABF////XAAAAxQAAAABAgAAAAeA///4gAAAABf/////AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAVoAAAAUAAAFeQAAAwIAAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANv</value> <value>AAAACAAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAHgAAABBAAAAGhAAAAGgAABcAAAAG9AAAAAAIAAAAHgAAAAAAAAAAXAAAHfwAABA8AAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAD///kPAAAAD////Z4AAAPu///5EAAAAC7///2dAAAD7QAAAAEAAAAAB4D///kQAAAALv///Z0AAAPtAAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEEP//+h4AAAAX///+qwAAAuYAAAABAgAAAAeA///4gAAAABf/////AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAlQAAAIxAAAGcwAABR8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANv</value>
</property> </property>
<relationship name="activePlatform"> <relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination> <destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

View File

@ -13,7 +13,7 @@
<value>Mixer 1</value> <value>Mixer 1</value>
</property> </property>
<property name="windowLayout"> <property name="windowLayout">
<value>AAAACAAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAHgAAABBAAAAGhAAAAGgAABcAAAAG9AAAAAAIAAAAHgAAAAAAAAAAXAAAHfwAABA8AAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAD///kPAAAAD////Z4AAAPu///5EAAAAC7///2dAAAD7QAAAAEAAAAAB4D///kQAAAALv///Z0AAAPtAAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEEP//+s8AAABF////XAAAAxQAAAABAgAAAAeA///4gAAAABf/////AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAVoAAAAUAAAFeQAAAwIAAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANv</value> <value>AAAACAAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAHgAAABBAAAAGhAAAAGgAABcAAAAG9AAAAAAIAAAAHgAAAAAAAAAAXAAAHfwAABA8AAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAD///kPAAAAD////Z4AAAPu///5EAAAAC7///2dAAAD7QAAAAEAAAAAB4D///kQAAAALv///Z0AAAPtAAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEEP//+h4AAAAX///+qwAAAuYAAAABAgAAAAeA///4gAAAABf/////AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAlQAAAIxAAAGcwAABR8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANv</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.

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.

View File

@ -176,7 +176,7 @@
</object> </object>
<object class="TransitionDestinationSound" id="{2cd7a7fc-5cbe-48cf-9e21-12feaf0bc200}"> <object class="TransitionDestinationSound" id="{2cd7a7fc-5cbe-48cf-9e21-12feaf0bc200}">
<property name="start"> <property name="start">
<value>16</value> <value>8</value>
</property> </property>
<property name="length"> <property name="length">
<value>0</value> <value>0</value>
@ -263,22 +263,16 @@
</object> </object>
<object class="TransitionSourceSound" id="{c6132126-b8f0-4533-8f90-3b06b44afc05}"> <object class="TransitionSourceSound" id="{c6132126-b8f0-4533-8f90-3b06b44afc05}">
<property name="length"> <property name="length">
<value>14</value> <value>8</value>
</property> </property>
<relationship name="fadeOutCurve"> <relationship name="fadeOutCurve">
<destination>{fcef430a-5a27-49fb-bca7-c48067ce89dc}</destination> <destination>{fcef430a-5a27-49fb-bca7-c48067ce89dc}</destination>
</relationship> </relationship>
</object> </object>
<object class="TransitionDestinationSound" id="{bba2571b-d086-4496-aacc-418c97702661}"> <object class="TransitionDestinationSound" id="{bba2571b-d086-4496-aacc-418c97702661}">
<property name="start">
<value>8</value>
</property>
<property name="length"> <property name="length">
<value>8</value> <value>8</value>
</property> </property>
<relationship name="fadeInCurve">
<destination>{bd89adb4-1b12-4002-85c6-e660bf2850c6}</destination>
</relationship>
</object> </object>
<object class="EventMixerGroup" id="{bfc48002-2ef1-42f0-bece-e23fafc40d4d}"> <object class="EventMixerGroup" id="{bfc48002-2ef1-42f0-bece-e23fafc40d4d}">
<property name="volume"> <property name="volume">
@ -343,7 +337,7 @@
</object> </object>
<object class="TransitionDestinationSound" id="{cc91c0eb-6746-4224-8435-91ec235b3fbe}"> <object class="TransitionDestinationSound" id="{cc91c0eb-6746-4224-8435-91ec235b3fbe}">
<property name="start"> <property name="start">
<value>16</value> <value>8</value>
</property> </property>
<property name="length"> <property name="length">
<value>0</value> <value>0</value>
@ -538,17 +532,6 @@
<destination>{d1458547-ebf0-4037-a157-c63879a7ad33}</destination> <destination>{d1458547-ebf0-4037-a157-c63879a7ad33}</destination>
</relationship> </relationship>
</object> </object>
<object class="TransitionDestinationFadeInCurve" id="{bd89adb4-1b12-4002-85c6-e660bf2850c6}">
<relationship name="startPoint">
<destination>{5f67c7e6-7f0b-462d-9892-bbfced59ac0d}</destination>
</relationship>
<relationship name="endPoint">
<destination>{40368b4f-80e7-47f7-a62d-fcd610b1e333}</destination>
</relationship>
<relationship name="relatedModule">
<destination>{c6132126-b8f0-4533-8f90-3b06b44afc05}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{149f5924-8d72-4157-a96e-8aa16815d232}"> <object class="MixerBusEffectChain" id="{149f5924-8d72-4157-a96e-8aa16815d232}">
<relationship name="effects"> <relationship name="effects">
<destination>{79a206fd-acf1-4460-8920-ee4af9dec064}</destination> <destination>{79a206fd-acf1-4460-8920-ee4af9dec064}</destination>
@ -613,7 +596,7 @@
</object> </object>
<object class="TransitionTimeline" id="{a67979f4-8859-4f47-85e5-ce9c39cb8ede}"> <object class="TransitionTimeline" id="{a67979f4-8859-4f47-85e5-ce9c39cb8ede}">
<property name="length"> <property name="length">
<value>16</value> <value>8</value>
</property> </property>
<relationship name="modules"> <relationship name="modules">
<destination>{c6132126-b8f0-4533-8f90-3b06b44afc05}</destination> <destination>{c6132126-b8f0-4533-8f90-3b06b44afc05}</destination>
@ -743,31 +726,12 @@
</property> </property>
</object> </object>
<object class="AutomationPoint" id="{d1458547-ebf0-4037-a157-c63879a7ad33}"> <object class="AutomationPoint" id="{d1458547-ebf0-4037-a157-c63879a7ad33}">
<property name="position">
<value>14</value>
</property>
<property name="value">
<value>0</value>
</property>
</object>
<object class="AutomationPoint" id="{5f67c7e6-7f0b-462d-9892-bbfced59ac0d}">
<property name="position"> <property name="position">
<value>8</value> <value>8</value>
</property> </property>
<property name="value"> <property name="value">
<value>0</value> <value>0</value>
</property> </property>
<property name="curveShape">
<value>-0.2547189</value>
</property>
</object>
<object class="AutomationPoint" id="{40368b4f-80e7-47f7-a62d-fcd610b1e333}">
<property name="position">
<value>14</value>
</property>
<property name="value">
<value>1</value>
</property>
</object> </object>
<object class="MixerBusFader" id="{79a206fd-acf1-4460-8920-ee4af9dec064}" /> <object class="MixerBusFader" id="{79a206fd-acf1-4460-8920-ee4af9dec064}" />
<object class="MixerBusFader" id="{3f69e8f6-f16a-439d-9f52-38b5263e4e96}" /> <object class="MixerBusFader" id="{3f69e8f6-f16a-439d-9f52-38b5263e4e96}" />

View File

@ -215,6 +215,9 @@
<property name="volume"> <property name="volume">
<value>-21.5</value> <value>-21.5</value>
</property> </property>
<relationship name="modulators">
<destination>{9339250e-255a-492e-a1aa-c6305cc1e9e7}</destination>
</relationship>
<relationship name="audioFile"> <relationship name="audioFile">
<destination>{32fb788c-9449-4ab8-afb8-4565e44c1877}</destination> <destination>{32fb788c-9449-4ab8-afb8-4565e44c1877}</destination>
</relationship> </relationship>
@ -246,7 +249,7 @@
<value>pitch</value> <value>pitch</value>
</property> </property>
<property name="amount"> <property name="amount">
<value>3</value> <value>4.5</value>
</property> </property>
</object> </object>
<object class="FadeCurve" id="{d38f9fcd-a790-4fea-aca5-433ca29b5941}"> <object class="FadeCurve" id="{d38f9fcd-a790-4fea-aca5-433ca29b5941}">
@ -308,6 +311,14 @@
</relationship> </relationship>
</object> </object>
<object class="MixerBusPanner" id="{06be364d-bc2c-45f3-88dc-f0f648b91671}" /> <object class="MixerBusPanner" id="{06be364d-bc2c-45f3-88dc-f0f648b91671}" />
<object class="RandomizerModulator" id="{9339250e-255a-492e-a1aa-c6305cc1e9e7}">
<property name="nameOfPropertyBeingModulated">
<value>pitch</value>
</property>
<property name="amount">
<value>19</value>
</property>
</object>
<object class="MixerBusEffectChain" id="{d7b55e9e-cc56-4d2f-acbb-8118c8652324}"> <object class="MixerBusEffectChain" id="{d7b55e9e-cc56-4d2f-acbb-8118c8652324}">
<relationship name="effects"> <relationship name="effects">
<destination>{209a3751-7952-4128-b372-f3fd7ce9794e}</destination> <destination>{209a3751-7952-4128-b372-f3fd7ce9794e}</destination>

View File

@ -128,8 +128,15 @@
<property name="timelockedOffset"> <property name="timelockedOffset">
<value>0.71263899125446351</value> <value>0.71263899125446351</value>
</property> </property>
<property name="maxVoices">
<value>1</value>
</property>
<property name="name" />
<property name="volume">
<value>-6</value>
</property>
<property name="pitch"> <property name="pitch">
<value>0.900000036</value> <value>6</value>
</property> </property>
<relationship name="modulators"> <relationship name="modulators">
<destination>{1a9ae509-d5d7-4e4d-a400-da458729d361}</destination> <destination>{1a9ae509-d5d7-4e4d-a400-da458729d361}</destination>
@ -142,9 +149,6 @@
</relationship> </relationship>
</object> </object>
<object class="EventMixerGroup" id="{f596111c-c887-490a-8356-de1fd5d17eff}"> <object class="EventMixerGroup" id="{f596111c-c887-490a-8356-de1fd5d17eff}">
<property name="volume">
<value>-14.5</value>
</property>
<property name="name"> <property name="name">
<value>Audio 1</value> <value>Audio 1</value>
</property> </property>
@ -168,6 +172,9 @@
<property name="timelockedOffset"> <property name="timelockedOffset">
<value>0.50721267409387993</value> <value>0.50721267409387993</value>
</property> </property>
<property name="maxVoices">
<value>1</value>
</property>
<relationship name="fadeOutCurve"> <relationship name="fadeOutCurve">
<destination>{ddcdf7fd-a4e0-482e-87d0-224a79f9434b}</destination> <destination>{ddcdf7fd-a4e0-482e-87d0-224a79f9434b}</destination>
</relationship> </relationship>
@ -199,6 +206,9 @@
<property name="timelockedOffset"> <property name="timelockedOffset">
<value>0.23779870828848218</value> <value>0.23779870828848218</value>
</property> </property>
<property name="maxVoices">
<value>1</value>
</property>
<relationship name="fadeOutCurve"> <relationship name="fadeOutCurve">
<destination>{a9a6dce0-6b7b-4b46-b80f-2687ee12d767}</destination> <destination>{a9a6dce0-6b7b-4b46-b80f-2687ee12d767}</destination>
</relationship> </relationship>
@ -260,7 +270,7 @@
<value>pitch</value> <value>pitch</value>
</property> </property>
<property name="amount"> <property name="amount">
<value>3</value> <value>1</value>
</property> </property>
</object> </object>
<object class="FadeCurve" id="{2b22ca0a-0283-4ff2-b8e4-94b2a31cd196}"> <object class="FadeCurve" id="{2b22ca0a-0283-4ff2-b8e4-94b2a31cd196}">

View File

@ -2,7 +2,7 @@
"BuildId": "23058290", "BuildId": "23058290",
"Modules": "Modules":
{ {
"FMODStudio": "UnrealEditor-FMODStudio-0004.dll", "FMODStudio": "UnrealEditor-FMODStudio.dll",
"FMODStudioEditor": "UnrealEditor-FMODStudioEditor-0004.dll" "FMODStudioEditor": "UnrealEditor-FMODStudioEditor.dll"
} }
} }