Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move sounds to FMOD #56

Merged
merged 17 commits into from
Dec 21, 2023
Merged

Move sounds to FMOD #56

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2a8c34b
move sounds to fmod
Govorunb Dec 12, 2023
7b1b6a3
switch from sound collections to fmod events
Govorunb Dec 12, 2023
4ec03a0
enable fmod live update
Govorunb Dec 13, 2023
a3511f4
move ItemSounds to a MonoBehaviour
Govorunb Dec 15, 2023
dd09fa3
bunch of fixes
Govorunb Dec 15, 2023
277f9e9
the funniest fix of the mall
Govorunb Dec 15, 2023
169c3a2
mess with buses some more
Govorunb Dec 15, 2023
2873be5
erm
Govorunb Dec 15, 2023
c9025bd
fix world sounds (again)
Govorunb Dec 15, 2023
43cfa98
more stuff
Govorunb Dec 16, 2023
1adc8a1
fix player death sounds
Govorunb Dec 16, 2023
5dd956f
Merge branch 'main' into i-love-fmod
Govorunb Dec 16, 2023
c052d00
Merge branch 'main' into i-love-fmod
Govorunb Dec 17, 2023
344c328
code polish
Govorunb Dec 17, 2023
6ba5956
add some ermfish cook noises
Govorunb Dec 17, 2023
bab5847
assets & banks
Govorunb Dec 17, 2023
91d5c51
Update .gitattributes
Govorunb Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ SCHIZO/Resources/AssetBundles/* merge=ours
*.asset text eol=lf
*.prefab text eol=lf
*.meta text eol=lf
*.asmdef text eol=lf
*.asmdef text eol=lf
FMOD Project/**/*.xml text eol=lf
Govorunb marked this conversation as resolved.
Show resolved Hide resolved
Binary file added FMOD Project/Assets/noises/neuro/Evil Chat I love you all.mp3
View file
Open in desktop
Binary file not shown.
Binary file added FMOD Project/Assets/noises/neuro/Evil Three paragraphs of insults.mp3
View file
Open in desktop
Binary file not shown.
Binary file added FMOD Project/Assets/noises/neuro/Evil Why did you do that.mp3
View file
Open in desktop
Binary file not shown.
Binary file added FMOD Project/Assets/noises/neuro/Evil_By_the_way_I_hate_you.mp3
View file
Open in desktop
Binary file not shown.
Binary file added FMOD Project/Assets/noises/neuro/evil Filtered x8.mp3
View file
Open in desktop
Binary file not shown.
20 changes: 20 additions & 0 deletions FMOD Project/Metadata/AudioFile/{331dac71-74e3-4db0-b593-b732e8b88f5f}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{331dac71-74e3-4db0-b593-b732e8b88f5f}">
<property name="assetPath">
<value>noises/neuro/Evil Why did you do that.mp3</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>1</value>
</property>
<property name="length">
<value>1.6457142857142857</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions FMOD Project/Metadata/AudioFile/{b18154ef-3f86-40ee-a875-002085d3ba7f}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{b18154ef-3f86-40ee-a875-002085d3ba7f}">
<property name="assetPath">
<value>noises/neuro/Evil Chat I love you all.mp3</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>1.4889795918367348</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions FMOD Project/Metadata/AudioFile/{f160e0dc-2b5d-417c-9185-a1f798c32f28}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{f160e0dc-2b5d-417c-9185-a1f798c32f28}">
<property name="assetPath">
<value>noises/neuro/Evil Three paragraphs of insults.mp3</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>2.1681632653061222</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions FMOD Project/Metadata/AudioFile/{f8059a99-d544-43b8-8a43-e8323c4d3f48}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{f8059a99-d544-43b8-8a43-e8323c4d3f48}">
<property name="assetPath">
<value>noises/neuro/evil Filtered x8.mp3</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>3.9444897959183671</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
20 changes: 20 additions & 0 deletions FMOD Project/Metadata/AudioFile/{fe0bdae8-5c0a-4d07-938b-b18516649505}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{fe0bdae8-5c0a-4d07-938b-b18516649505}">
<property name="assetPath">
<value>noises/neuro/Evil_By_the_way_I_hate_you.mp3</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>2.1420408163265305</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
17 changes: 17 additions & 0 deletions FMOD Project/Metadata/EncodingSetting/{40a9224d-beb8-4946-825b-817e74194f7c}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EncodingSetting" id="{40a9224d-beb8-4946-825b-817e74194f7c}">
<property name="encodingFormat">
<value>3</value>
</property>
<property name="quality">
<value>35</value>
</property>
<relationship name="platform">
<destination>{866b1d1c-ade9-488e-a1af-d2a458fcdfb1}</destination>
</relationship>
<relationship name="encodable">
<destination>{19d1452c-b977-4ac6-95e5-eb91a3d88fee}</destination>
</relationship>
</object>
</objects>
144 changes: 114 additions & 30 deletions FMOD Project/Metadata/Event/{14de5335-ec95-49af-ba08-f9f994d198c7}.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<value>cook</value>
</property>
<property name="outputFormat">
<value>1</value>
<value>2</value>
</property>
<relationship name="folder">
<destination>{771bccf8-cce5-418a-a524-79c94f1337fe}</destination>
Expand All @@ -25,14 +25,13 @@
<relationship name="markerTracks">
<destination>{ffcde3d2-a590-422e-b66b-7f4ae6420e7a}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{be0c1090-ddc8-47c9-a0cc-a8239b29b00e}</destination>
</relationship>
<relationship name="timeline">
<destination>{12032229-6fd3-48fb-8248-fd442b00a139}</destination>
</relationship>
<relationship name="parameters">
<destination>{e35b7b12-b54d-4e05-a30e-7929664dbfae}</destination>
<destination>{2f19ed91-ae76-4949-8341-65e96d7289b0}</destination>
<destination>{cc5dbe11-70b2-48b5-a896-bf8e14911818}</destination>
</relationship>
<relationship name="banks">
<destination>{6f6c823e-9073-439e-9503-3b2b490ddbfb}</destination>
Expand All @@ -44,6 +43,10 @@
</relationship>
</object>
<object class="MasterTrack" id="{a47bfef0-c5b5-486d-b506-a310ea301523}">
<relationship name="automationTracks">
<destination>{ce472bdb-9441-4589-a135-2382c2dec4ef}</destination>
<destination>{e36e2359-e1e5-446e-8940-df0180669392}</destination>
</relationship>
<relationship name="modules">
<destination>{2d0ff93e-e9de-4501-b4d8-d92b3833977f}</destination>
</relationship>
Expand All @@ -59,16 +62,11 @@
<destination>{675a631e-e622-4409-9cf2-be7dc212b8c2}</destination>
</relationship>
<relationship name="output">
<destination>{666945d3-524f-4809-ae5d-c1c1cd7d84c6}</destination>
<destination>{7f788ad5-e695-4a25-aba3-82767a4b1ec7}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{139abf40-40a1-4619-893c-704ff8aebc4d}" />
<object class="MarkerTrack" id="{ffcde3d2-a590-422e-b66b-7f4ae6420e7a}" />
<object class="GroupTrack" id="{be0c1090-ddc8-47c9-a0cc-a8239b29b00e}">
<relationship name="mixerGroup">
<destination>{edf25067-7c68-4bae-a562-28adb0421faa}</destination>
</relationship>
</object>
<object class="Timeline" id="{12032229-6fd3-48fb-8248-fd442b00a139}">
<property name="isProxyEnabled">
<value>false</value>
Expand All @@ -79,6 +77,16 @@
<destination>{2d0ff93e-e9de-4501-b4d8-d92b3833977f}</destination>
</relationship>
</object>
<object class="ParameterProxy" id="{2f19ed91-ae76-4949-8341-65e96d7289b0}">
<relationship name="preset">
<destination>{540cf702-5f8a-4a1d-99f5-d9a31a53c833}</destination>
</relationship>
</object>
<object class="ParameterProxy" id="{cc5dbe11-70b2-48b5-a896-bf8e14911818}">
<relationship name="preset">
<destination>{255c0af3-d82c-48de-970b-933bda576119}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{7f6d89a1-e8a7-4ba1-a645-d5a9ca507315}">
<relationship name="effectChain">
<destination>{8e46e64e-457f-4893-948d-f2f11df92fb3}</destination>
Expand All @@ -90,8 +98,19 @@
<destination>{9f603c91-fa81-4542-bce8-c4de1133487c}</destination>
</relationship>
</object>
<object class="AutomationTrack" id="{ce472bdb-9441-4589-a135-2382c2dec4ef}">
<relationship name="automator">
<destination>{7057829f-97fc-4dba-b6ca-62909f5e8d69}</destination>
</relationship>
</object>
<object class="AutomationTrack" id="{e36e2359-e1e5-446e-8940-df0180669392}">
<relationship name="automator">
<destination>{d0dd02e5-0744-4c06-9a12-193db7e36922}</destination>
</relationship>
</object>
<object class="MultiSound" id="{2d0ff93e-e9de-4501-b4d8-d92b3833977f}">
<relationship name="sounds">
<destination>{baa35633-7c5f-4801-8218-2ca20461e2b4}</destination>
<destination>{4828a929-4152-46e5-b98c-945a7a7ea1b1}</destination>
</relationship>
</object>
Expand All @@ -101,26 +120,18 @@
</relationship>
</object>
<object class="MixerBusPanner" id="{675a631e-e622-4409-9cf2-be7dc212b8c2}" />
<object class="EventMixerGroup" id="{edf25067-7c68-4bae-a562-28adb0421faa}">
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{68b83339-e8c6-49c6-8d91-d80b3f5d42f4}</destination>
</relationship>
<relationship name="panner">
<destination>{9bfa4f8e-25cc-42df-a016-9e16357452c9}</destination>
</relationship>
<relationship name="output">
<destination>{7f6d89a1-e8a7-4ba1-a645-d5a9ca507315}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{8e46e64e-457f-4893-948d-f2f11df92fb3}">
<relationship name="effects">
<destination>{9069bddd-ad6f-43a1-aabc-485a75f1a42f}</destination>
<destination>{d939376b-d3e4-4e6b-9d4d-92ff8cbd617f}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{b5fdb9be-c232-4697-9ff4-32c337ca9cfa}" />
<object class="SilenceSound" id="{baa35633-7c5f-4801-8218-2ca20461e2b4}">
<relationship name="automators">
<destination>{7057829f-97fc-4dba-b6ca-62909f5e8d69}</destination>
</relationship>
</object>
<object class="MultiSound" id="{4828a929-4152-46e5-b98c-945a7a7ea1b1}">
<relationship name="sounds">
<destination>{4dffe96f-ae99-4cac-b298-7eeb65e521e0}</destination>
Expand All @@ -135,13 +146,23 @@
</relationship>
</object>
<object class="MixerBusFader" id="{5f07e29d-e0a6-4823-a857-e7ffb0c64ac9}" />
<object class="MixerBusEffectChain" id="{68b83339-e8c6-49c6-8d91-d80b3f5d42f4}">
<relationship name="effects">
<destination>{7db1ee88-2e2c-458f-86a3-4707c6e1d1d3}</destination>
<object class="MixerBusFader" id="{9069bddd-ad6f-43a1-aabc-485a75f1a42f}" />
<object class="SpatialiserEffect" id="{d939376b-d3e4-4e6b-9d4d-92ff8cbd617f}">
<property name="userStereoSeparation">
<value>90</value>
</property>
<relationship name="automators">
<destination>{d0dd02e5-0744-4c06-9a12-193db7e36922}</destination>
</relationship>
</object>
<object class="Automator" id="{7057829f-97fc-4dba-b6ca-62909f5e8d69}">
<property name="nameOfPropertyBeingAutomated">
<value>duration</value>
</property>
<relationship name="automationCurves">
<destination>{2a8988d0-789f-411d-aa48-d9d033b17f54}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{9bfa4f8e-25cc-42df-a016-9e16357452c9}" />
<object class="MixerBusFader" id="{9069bddd-ad6f-43a1-aabc-485a75f1a42f}" />
<object class="SingleSound" id="{4dffe96f-ae99-4cac-b298-7eeb65e521e0}">
<relationship name="audioFile">
<destination>{bdba604e-eb1c-4dec-8a23-2df5dc12f1db}</destination>
Expand Down Expand Up @@ -187,5 +208,68 @@
<destination>{91075e86-d92e-42ae-a719-7c70cc11cb68}</destination>
</relationship>
</object>
<object class="MixerBusFader" id="{7db1ee88-2e2c-458f-86a3-4707c6e1d1d3}" />
<object class="Automator" id="{d0dd02e5-0744-4c06-9a12-193db7e36922}">
<property name="nameOfPropertyBeingAutomated">
<value>panBlend</value>
</property>
<relationship name="automationCurves">
<destination>{11089163-3c00-4d47-b46b-d05812aea332}</destination>
<destination>{2654bb0b-10ce-41cf-af83-58ed41c0bfe6}</destination>
</relationship>
</object>
<object class="AutomationCurve" id="{2a8988d0-789f-411d-aa48-d9d033b17f54}">
<relationship name="parameter">
<destination>{255c0af3-d82c-48de-970b-933bda576119}</destination>
</relationship>
<relationship name="automationPoints">
<destination>{fcb31373-130a-4d8d-88e2-97f29331d23c}</destination>
<destination>{6f444e49-8cd2-4993-8736-15f5eb488fe0}</destination>
</relationship>
</object>
<object class="AutomationCurve" id="{11089163-3c00-4d47-b46b-d05812aea332}">
<relationship name="parameter">
<destination>{12032229-6fd3-48fb-8248-fd442b00a139}</destination>
</relationship>
</object>
<object class="AutomationCurve" id="{2654bb0b-10ce-41cf-af83-58ed41c0bfe6}">
<relationship name="parameter">
<destination>{540cf702-5f8a-4a1d-99f5-d9a31a53c833}</destination>
</relationship>
<relationship name="automationPoints">
<destination>{0c5c18ab-264b-49e9-a767-ca7b449c5a05}</destination>
<destination>{242edb1b-6363-4528-8f9f-9078bf04bfc6}</destination>
</relationship>
</object>
<object class="AutomationPoint" id="{fcb31373-130a-4d8d-88e2-97f29331d23c}">
<property name="position">
<value>0</value>
</property>
<property name="value">
<value>0</value>
</property>
</object>
<object class="AutomationPoint" id="{6f444e49-8cd2-4993-8736-15f5eb488fe0}">
<property name="position">
<value>60</value>
</property>
<property name="value">
<value>60000</value>
</property>
</object>
<object class="AutomationPoint" id="{0c5c18ab-264b-49e9-a767-ca7b449c5a05}">
<property name="position">
<value>0</value>
</property>
<property name="value">
<value>0</value>
</property>
</object>
<object class="AutomationPoint" id="{242edb1b-6363-4528-8f9f-9078bf04bfc6}">
<property name="position">
<value>1</value>
</property>
<property name="value">
<value>1</value>
</property>
</object>
</objects>
Loading