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

Jump to bottom

Most SFX implemented #92

Merged
merged 27 commits into from
Dec 6, 2023
Merged

Most SFX implemented #92

merged 27 commits into from
Dec 6, 2023

Conversation

cosmicmonkeysounds
Copy link
Contributor

Better chain loop, all UI and dialogue sounds, floodlight on sound - I tried to make a loop happen for the floodlights when they are turned on but can't quite figure it out.

Jananigans and others added 26 commits August 9, 2023 13:42
added unique character footsteps
07fe098
updated dock ambience track
b51063d
added grass footsteps, moved ambience to FMOD global
efd8c9b
Merge remote-tracking branch 'origin/main' into sound-design
67e83c8 
# Conflicts:
#	.fmod/Metadata/Event/{06a4b985-22c5-49e5-a48d-4c2b44ca8fad}.xml
#	.fmod/Metadata/Event/{7d63e971-1d9e-4ff6-82a2-16f080b91575}.xml
#	Assets/Audio/AudioManager.cs
#	Assets/Player/PlayerController.cs
@aarthificial
feat: settings
2373ef7
new audio wrapper classes
cf551f8
Merge remote-tracking branch 'origin/settings' into sound-design
3701735 
# Conflicts:
#	Assets/Audio/AudioManager.cs
new FMOD event and parameter system
f2f8013
Merge remote-tracking branch 'origin/main' into sound-design
2feda05 
# Conflicts:
#	Assets/Audio/AudioManager.cs
#	ProjectSettings/QualitySettings.asset
@cosmicmonkeysounds
updated package.json
c974e47
@cosmicmonkeysounds
made requested changes in PR #23
a7cce00
@cosmicmonkeysounds
PlayerManager now manages the state of PlayerControllers StepFocusPar…
c8bfb54 
…am, positional sound working
@aarthificial
Revert "feat: FMOD Event & Parameter system (#23)"
e46b9cb 
This reverts commit a546ea9.
@cosmicmonkeysounds
Merge remote-tracking branch 'origin/revert-23-sound-design' into sou…
edd062e 
…nd-design
@cosmicmonkeysounds
Merge branch 'main' into sound-design
ff795a4
@cosmicmonkeysounds
chain sfx, footstep update
2f21442
@cosmicmonkeysounds
Merge tag 'v0.13.0' into sound-design
f09477f
@cosmicmonkeysounds
moved chain sfx update to fixed update, tweaked chain sfx sound
0eb9fc1
@cosmicmonkeysounds
chain update, added vcas
2a34795
@cosmicmonkeysounds
Merge remote-tracking branch 'origin/main' into sound-design
0904bea 
# Conflicts:
#	.fmod/Metadata/Asset/{3480c89c-61a2-4bc7-a774-9e1acd381b0c}.xml
#	.fmod/Metadata/Asset/{37956987-a169-45bc-9962-2491eef131ad}.xml
#	.fmod/Metadata/Asset/{56d027b2-1c30-4b0f-87c2-ecc73e3db9e4}.xml
#	.fmod/Metadata/Asset/{61ee42b3-2922-4e9c-871e-4e28cf7572b2}.xml
#	.fmod/Metadata/Asset/{7d8bdcbe-74dc-4c27-ba71-1d476686a0f5}.xml
#	.fmod/Metadata/Asset/{8839cce8-64f1-4e46-9b81-3300b2ba7780}.xml
#	.fmod/Metadata/Asset/{b7724351-7259-4295-a0e6-e75fe2385549}.xml
#	.fmod/Metadata/Asset/{bff437a1-523b-4670-81da-a07f1ed71101}.xml
#	.fmod/Metadata/AudioFile/{0f183e41-55c6-42d3-995d-b6c9f62fd07b}.xml
#	.fmod/Metadata/AudioFile/{1088b2df-d8f8-474e-9eab-161225d9b57f}.xml
#	.fmod/Metadata/AudioFile/{121e487e-780b-4026-8e4a-cf6e3d4ded6c}.xml
#	.fmod/Metadata/AudioFile/{13f67be7-3684-4808-9207-68735cedcf6b}.xml
#	.fmod/Metadata/AudioFile/{16d7460d-7c6f-40ee-979c-09b0b0627f0c}.xml
#	.fmod/Metadata/AudioFile/{22638fe3-62af-47d4-840b-4c0343b9df65}.xml
#	.fmod/Metadata/AudioFile/{22d2e8c1-d401-4135-986b-50ce83a95db2}.xml
#	.fmod/Metadata/AudioFile/{399fa8ce-5e85-4b3d-ab54-11194ae37f31}.xml
#	.fmod/Metadata/AudioFile/{463ef416-52ba-4fa7-acad-9ca4bf77752b}.xml
#	.fmod/Metadata/AudioFile/{527c6666-6fca-4e06-8aa5-322f2cec4808}.xml
#	.fmod/Metadata/AudioFile/{5516b86d-22a0-4168-a1d6-840ac992b497}.xml
#	.fmod/Metadata/AudioFile/{60fbaf47-7869-43c5-b015-60b30dcab1b4}.xml
#	.fmod/Metadata/AudioFile/{7ee33588-f891-4157-af8a-f1925b9f25f0}.xml
#	.fmod/Metadata/AudioFile/{a3dd322f-5cfb-4f41-b1af-41be98c83286}.xml
#	.fmod/Metadata/AudioFile/{ac4a78be-2c2a-4883-ae06-bcb736b4d372}.xml
#	.fmod/Metadata/AudioFile/{acebe8df-aff0-4df0-9c14-8a4390b349b5}.xml
#	.fmod/Metadata/AudioFile/{e228083f-be05-493e-9d27-b274ba26931b}.xml
#	.fmod/Metadata/AudioFile/{edc3ccf7-b7d0-40c4-9cdc-2ca5399057bf}.xml
#	.fmod/Metadata/Event/{06a4b985-22c5-49e5-a48d-4c2b44ca8fad}.xml
#	.fmod/Metadata/Event/{fcbcbb36-468b-444a-9794-051d366c9123}.xml
#	.fmod/Metadata/ParameterPreset/{c74b2a05-e670-4ef5-9788-55d2344ff4e5}.xml
#	Assets/Audio/Events/ChainEvent.asset
#	Assets/Player/ChainManager.cs
#	Assets/Player/Prefab/PlayerManager.prefab
@cosmicmonkeysounds
implemented acceration / velocity params + tweening for the chain
122d1a6
@cosmicmonkeysounds
ui and dialogue sounds implemented
662620c
@cosmicmonkeysounds
Merge remote-tracking branch 'origin/main' into sound-design
213f5e0
@cosmicmonkeysounds
folder click
70fb321
@cosmicmonkeysounds
Merge branch 'release' into sound-design
bc54c04 
# Conflicts:
#	.fmod/Metadata/Event/{ecceccc1-a345-40b3-ab32-168017d4ca32}.xml
#	Assets/Audio/Events/Office/OfficeBoardClickEvent.asset
#	Assets/Audio/Events/Office/OfficeBoardHoverEvent.asset
#	Assets/Audio/Events/Office/OfficeDoorClickEvent.asset
#	Assets/Audio/Events/Office/OfficeDoorHoverEvent.asset
#	Assets/Audio/Events/Office/OfficeFolderClickEvent.asset
#	Assets/Audio/Events/Office/OfficeFolderHoverEvent.asset
#	Assets/Audio/Events/Office/OfficeTapeDeselectEvent.asset
#	Assets/Audio/Events/Office/OfficeTapeHoverEvent.asset
#	Assets/Audio/Events/Office/OfficeTapeSelectEvent.asset
#	Assets/Scenes/Intro/EntryGate.unity
#	Assets/View/Dialogue/DialogueTrack.cs
@cosmicmonkeysounds
most sfx implemented
d3bd4d5
aarthificial
aarthificial requested changes Dec 6, 2023
View reviewed changes
Copy link
Collaborator

@aarthificial aarthificial left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you take a look at the outro scene because it seems broken now?

Assets/Player/ManagerStates/DialogueState.cs Outdated
Comment on lines 235 to 236
//Assert.AreEqual(CurrentEntry, entry);
//Assert.AreEqual(_subState, SubState.Dialogue);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be commented out

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops! left over from a silly bug hunt...

Assets/Framework/StoryBundle.prefab Outdated
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5c4af37a6a9941ff80ca677dd65e9de5, type: 3}
m_Name:
m_EditorClassIdentifier:
_sound:
Event: {fileID: 11400000, guid: 2668f83afc689754ba6349f9f42aecce, type: 2}
_playOnEnable: 1
_playOnEnable: 0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this desired? An audio emitter won't play anything when this is disabled.
If it's not necessary then the whole component should be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just deleted the component; for now the Audio Manager is managing the ambience (and soon music)

@cosmicmonkeysounds
Copy link
Contributor Author

There is a fancy new "TapeLocationParameter" for the differing cardboard / tape player sounds - I chose to keep the same OfficeTapeHover event and just change the params: 0 for cardboard (left), 1 for the player.

@aarthificial aarthificial merged commit 7d43e28 into main Dec 6, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aarthificial aarthificial aarthificial approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cosmicmonkeysounds @aarthificial