starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

[PR #2974] [MERGED] Upstream Netplay Changes #1417

New Issue
Closed
opened 2026-01-29 19:16:45 +00:00 by claunia · 0 comments
claunia commented 2026-01-29 19:16:45 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/stenzek/duckstation/pull/2974
Author: @HeatXD
Created: 5/10/2023
Status: ✅ Merged
Merged: 5/10/2023
Merged by: @stenzek

Base: netplay ← Head: netplay_dev

📝 Commits (9)

  • eb77894 Update README.md
  • 7681551 System: Don't auto enable analog on unknown games
  • ddaa717 Netplay: Wired up netplay chat.
  • c2e75c4 Netplay HandleSessionMessage: fix err msg.
  • 8a7cbf2 Netplay / Qt: remove ping widget from mainwindow.
  • 4377afd Merge branch 'stenzek:master' into netplay_dev
  • 91e7caa Netplay: Move chat back to the control channel
  • 59bcb05 Update netplay.h
  • a876a8d Netplay: Only load netplay savestate whenever you are the host. the hostwill share state to the other peers.

📊 Changes

10 files changed (+92 additions, -109 deletions)

View changed files

📝 README.md (+2 -22)
📝 src/core/analog_controller.cpp (+2 -3)
📝 src/core/netplay.cpp (+74 -48)
📝 src/core/netplay.h (+2 -2)
📝 src/core/system.cpp (+6 -10)
📝 src/core/system.h (+1 -1)
📝 src/duckstation-qt/mainwindow.cpp (+0 -5)
📝 src/duckstation-qt/mainwindow.h (+0 -2)
📝 src/duckstation-qt/qthost.cpp (+2 -15)
📝 src/frontend-common/imgui_netplay.cpp (+3 -1)

📄 Description

  • wire up netplay chat and also created a channel for non-control type messages
  • removed netplay ping widget from the main window
  • only load initial netplay savestate if you are the host

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/stenzek/duckstation/pull/2974 **Author:** [@HeatXD](https://github.com/HeatXD) **Created:** 5/10/2023 **Status:** ✅ Merged **Merged:** 5/10/2023 **Merged by:** [@stenzek](https://github.com/stenzek) **Base:** `netplay` ← **Head:** `netplay_dev` --- ### 📝 Commits (9) - [`eb77894`](https://github.com/stenzek/duckstation/commit/eb778943153cee9dcadca227f3b4fdae6f50ab84) Update README.md - [`7681551`](https://github.com/stenzek/duckstation/commit/7681551544c39294369d0f0366971a0d76cf045c) System: Don't auto enable analog on unknown games - [`ddaa717`](https://github.com/stenzek/duckstation/commit/ddaa7172c82ada87444ea98d109442a725c62240) Netplay: Wired up netplay chat. - [`c2e75c4`](https://github.com/stenzek/duckstation/commit/c2e75c4daaf52ca39aee60548ea2b0b092dfa7ec) Netplay HandleSessionMessage: fix err msg. - [`8a7cbf2`](https://github.com/stenzek/duckstation/commit/8a7cbf2f669d5706cf88653cc4b0b37ed1d803f4) Netplay / Qt: remove ping widget from mainwindow. - [`4377afd`](https://github.com/stenzek/duckstation/commit/4377afda9256c51df34c7fc44527bdecc53c1f7c) Merge branch 'stenzek:master' into netplay_dev - [`91e7caa`](https://github.com/stenzek/duckstation/commit/91e7caab16b8fd5a55cdc737a45560ef15933342) Netplay: Move chat back to the control channel - [`59bcb05`](https://github.com/stenzek/duckstation/commit/59bcb05bd02879d7c3d3575f666ed77291599dc7) Update netplay.h - [`a876a8d`](https://github.com/stenzek/duckstation/commit/a876a8df5543327e5135b880b1daa72991f6ad0e) Netplay: Only load netplay savestate whenever you are the host. the hostwill share state to the other peers. ### 📊 Changes **10 files changed** (+92 additions, -109 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+2 -22) 📝 `src/core/analog_controller.cpp` (+2 -3) 📝 `src/core/netplay.cpp` (+74 -48) 📝 `src/core/netplay.h` (+2 -2) 📝 `src/core/system.cpp` (+6 -10) 📝 `src/core/system.h` (+1 -1) 📝 `src/duckstation-qt/mainwindow.cpp` (+0 -5) 📝 `src/duckstation-qt/mainwindow.h` (+0 -2) 📝 `src/duckstation-qt/qthost.cpp` (+2 -15) 📝 `src/frontend-common/imgui_netplay.cpp` (+3 -1) </details> ### 📄 Description - wire up netplay chat ~~and also created a channel for non-control type messages~~ - removed netplay ping widget from the main window - only load initial netplay savestate if you are the host --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-29 19:16:45 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
pull-request
Mirrored from GitHub Pull Request
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/duckstation#1417
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?