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.

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

OSCQuery support #958

Merged
merged 46 commits into from
Jul 31, 2024
Merged

OSCQuery support #958

merged 46 commits into from
Jul 31, 2024

Conversation

Erimelowo
Copy link
Member

@Erimelowo Erimelowo commented Mar 13, 2024

OSCQuery allows VRChat's ports and address to be automatically detected.
It also allows SlimeVR to advertise that it wants head and controller data and for VRChat to send it to us.

@ImUrX
Copy link
Member

ImUrX commented Mar 13, 2024

I'm in pain

@Erimelowo Erimelowo marked this pull request as ready for review March 16, 2024 18:16
@Erimelowo Erimelowo marked this pull request as ready for review April 29, 2024 01:14
server/core/src/main/java/dev/slimevr/VRServer.kt Outdated Show resolved Hide resolved
server/core/build.gradle.kts Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt Outdated Show resolved Hide resolved
@Erimelowo Erimelowo requested a review from loucass003 as a code owner June 29, 2024 23:25
@Erimelowo
Copy link
Member Author

Fixed the VMCHandler and merged up to date @ImUrX

@ButterscotchV ButterscotchV added Priority: Normal The default priority Area: GUI Related to the GUI Type: Enhancement Adds or improves a feature Area: Translation Improvements or additions to translations Area: Server Related to the server Area: VRCOSC Related to the VRChat OSC driver labels Jul 25, 2024
@ImUrX
Copy link
Member

ImUrX commented Jul 30, 2024

fix merge conflicts pls

@ImUrX ImUrX merged commit 58ca3fe into main Jul 31, 2024
12 checks passed
@ImUrX ImUrX deleted the oscquery branch July 31, 2024 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: GUI Related to the GUI Area: Server Related to the server Area: Translation Improvements or additions to translations Area: VRCOSC Related to the VRChat OSC driver Priority: Normal The default priority Type: Enhancement Adds or improves a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants