Skip to content

[MTT-8881] Integrate proximity voice-chat #261

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
Merged
merged 49 commits into from
Dec 4, 2024
Merged

[MTT-8881] Integrate proximity voice-chat #261

merged 49 commits into from
Dec 4, 2024

Conversation

@hammerlerobi
Copy link
Contributor

@hammerlerobi hammerlerobi commented Nov 26, 2024 •
edited
Loading

Description

This PR, adds positional voice-chat to the Sample. On the UI side it adds a Voice Indicator to the Avatar and a simple UI to make change Audio Settings.

To implement Voice chat a second Vivox Channel has been added. Positional Voice chat settings are not yet tuned.

Behaviour of the UI:

  • User speaks, Voice Icon will show.
  • User is muted, Mute Icon will show.
  • If another User is in range and is talking the Voice icon will show up otherwise it will not show up.
Screenshot 2024-11-26 at 15 22 05 Screenshot 2024-11-26 at 15 21 58 Screenshot 2024-11-26 at 15 22 17

Known issues:

Issue Number(s)

MTT-8881

Contribution checklist

  • [N/A] Tests have been added for the project and/or any internal package
  • Release notes have been added to the project changelog file
  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • JIRA ticket ID is in the PR title or at least one commit message
  • Include the ticket ID number within the body message of the PR to create a hyperlink

Elfi0Kuhndorf and others added 30 commits November 7, 2024 10:50
@Elfi0Kuhndorf
recreation of vivox scripts from old PR
bb8dfa0
@Elfi0Kuhndorf
updating ServiceHelper to join channel
99c892d
@hammerlerobi
wip: Enable Vivox, voice and text working somehow without UI atm
b40e0aa
@hammerlerobi
wip: textchat working
62e236b
@hammerlerobi
feat: improve Chat
a130940
@hammerlerobi
wip: Improve TextChat
0f5dba5
@hammerlerobi
wip: achitectural changes
e0c12fb
@hammerlerobi
wip: small improvements
a865c81
@hammerlerobi
chore: decouple TextChat from Services
996ae1b
@hammerlerobi
chore: cleanup
ee013f9
@hammerlerobi
feat: Block Player Input on Chat Input focused
a1436bf
@hammerlerobi
fix: await Vivox Login
0a6bc49
@hammerlerobi
chore: remove unused files
d62afb4
@hammerlerobi
chore: remove scene
caaa3bf
@hammerlerobi
fix: focus state on textfield
d6e40eb
@hammerlerobi
fix: improve initialization and handle session leave
1d8170c
@hammerlerobi
chore: cleanup
0a0d12c
@hammerlerobi
wip: Add positional voice chat
f4e064e
@hammerlerobi
chore: improve architecture
19680a2
@hammerlerobi
chore: add icon
661280b
@hammerlerobi
fix: apply review changes
49128af
@hammerlerobi
feat: seperate voice and textchat
1fcc5db
@hammerlerobi
Merge branch 'feat/distributed-authority-sample/vivox-integration-upd…
6beb415 
…ate' into feat/distributed-authority-sample/vivox-integration-voicechat

# Conflicts:
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs
@hammerlerobi
fix: catching some potential null refs
03ffd6a
@hammerlerobi
Merge branch 'develop' into feat/distributed-authority-sample/vivox-i…
2999565 
…ntegration-voicechat

# Conflicts:
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/GameplayEventHandler.cs
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/Unity.Multiplayer.Samples.SocialHub.Services.asmdef
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/TextChatManager.cs
@hammerlerobi
feat: select audio device wip
3b242ca
@hammerlerobi
fix: add missing UI
6a3b54e
@hammerlerobi
feat: Make sure to ask for Microphone permissions on MacOS
331348b
@hammerlerobi
wip: VoiceChat feature complete. Needs cleanup
20743e6
@hammerlerobi
fix: Focus issue
b25c4c5
@hammerlerobi hammerlerobi changed the base branch from main to develop November 26, 2024 11:07
hammerlerobi added a commit that referenced this pull request Nov 27, 2024
@hammerlerobi
fix: Disabling VoiceChat for now as it causes a Permission Error on i…
2456024 
…OS, this issue is already adressed in #261
@hammerlerobi hammerlerobi mentioned this pull request Nov 27, 2024
Closed
6 tasks
@hammerlerobi hammerlerobi changed the title Feat/distributed authority sample/vivox integration voicechat [MTT-8881] Integrate proximity voice-chat Nov 27, 2024
@hammerlerobi hammerlerobi marked this pull request as ready for review November 27, 2024 13:55
@hammerlerobi hammerlerobi requested a review from a team as a code owner November 27, 2024 13:55
hammerlerobi added a commit that referenced this pull request Dec 2, 2024
@fernando-cortez @hammerlerobi
feat: distributed authority sample/expanded controls [MTT-9277] (#256)
5cf9b2f 
* adding gamepad controls

* adding mobile input wrapper, mobile UI, desktop & mobile actions ready

* changelog addition

* cleanup: typos, removed logs

* fix: Disabling VoiceChat for now as it causes a Permission Error on iOS, this issue is already adressed in #261

* consistent access modifiers

* fix: Make mobile controls setting available again

---------

Co-authored-by: Robert Hammerle <[email protected]>
Co-authored-by: hammerlerobi <[email protected]>
fernando-cortez
fernando-cortez reviewed Dec 3, 2024
View reviewed changes
@hammerlerobi hammerlerobi force-pushed the feat/distributed-authority-sample/vivox-integration-voicechat branch from 1c1fae2 to 00a7b8a Compare December 3, 2024 13:06
@hammerlerobi
chore: change subscription to events
5e46a9d
@hammerlerobi
chore: remove UI dependency in VivoxManager
7631e17
@hammerlerobi
Merge branch 'develop' into feat/distributed-authority-sample/vivox-i…
2caffea 
…ntegration-voicechat

# Conflicts:
#	Basic/DistributedAuthoritySocialHub/Assets/Prefabs/Characters/Avatar.prefab
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/Unity.Multiplayer.Samples.SocialHub.GameManagement.asmdef
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/IngameMenu.cs
#	Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/Unity.Multiplayer.Samples.SocialHub.UI.asmdef
#	CHANGELOG.md
@hammerlerobi
chore: remove unnecessary argument
b79642b
@hammerlerobi
chore: cleanup ingameMenu
e4f69ef
@hammerlerobi
fix: reapply VivoxPosition Component
271ce2b
@hammerlerobi hammerlerobi enabled auto-merge (squash) December 4, 2024 18:15
@hammerlerobi hammerlerobi merged commit f3ae2fd into develop Dec 4, 2024
29 checks passed
@hammerlerobi hammerlerobi deleted the feat/distributed-authority-sample/vivox-integration-voicechat branch December 4, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@fernando-cortez fernando-cortez fernando-cortez approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hammerlerobi @fernando-cortez @Elfi0Kuhndorf