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

feat: support multiplayer mode in teapot #2317

Merged
merged 2 commits into from
Aug 30, 2023
Merged

feat: support multiplayer mode in teapot #2317

merged 2 commits into from
Aug 30, 2023

Conversation

hamusuke0323
Copy link
Contributor

@hamusuke0323 hamusuke0323 commented Aug 29, 2023 •
edited
Loading

Description

Supports multiplayer mode in teapot (home)
https://github.com/Grasscutters/Grasscutter/assets/60880668/312ed45a-60f0-4779-bc19-624e94c757c8

Issues fixed by this PR

#839

Type of changes

  • Bug fix
  • New feature
  • Enhancement
  • Documentation

Checklist:

  • My code follows the style guidelines of this project
  • My pull request is unique and no other pull requests have been opened for these changes
  • I have read the Contributing note and Code of conduct
  • I am responsible for any copyright issues with my code if it occurs in the future.
homempmode.mp4

@KingRainbow44
Copy link
Member

can you resolve merge conflicts?

@hamusuke0323
Copy link
Contributor Author

ok

@KingRainbow44 KingRainbow44 merged commit 8563d4b into Grasscutters:dev-4.0 Aug 30, 2023
1 of 2 checks passed
@hamusuke0323 hamusuke0323 deleted the homempmode branch August 30, 2023 05:06
@hamusuke0323 hamusuke0323 restored the homempmode branch August 30, 2023 05:09
@hamusuke0323 hamusuke0323 deleted the homempmode branch August 30, 2023 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@hamusuke0323 @KingRainbow44