mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2026-04-26 00:05:58 +03:00
[PR #1178] [MERGED] added discord rpc #1975
Labels
No labels
Bloodborne
bug
contributor wanted
documentation
enhancement
frontend
good first issue
help wanted
linux
pull-request
question
release
verification progress
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/shadPS4#1975
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
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?
📋 Pull Request Information
Original PR: https://github.com/shadps4-emu/shadPS4/pull/1178
Author: @delledev
Created: 10/1/2024
Status: ✅ Merged
Merged: 10/8/2024
Merged by: @georgemoralis
Base:
main← Head:main📝 Commits (10+)
18df757added discord rpc55f4e39linting issuesd2a7c78Revert "linting issues"319e6c5fix clang-format issues8354a3fremoved wrong rpc submodule19f0d23added correct rpc submodule9e9cd41Moved cmake instructions to correct files.05c98bcadded minor suggestions from pr660af35Added an option to enable/disable RPC, added rpc to emulator.cpp making it work on nonqt buildsfb18a7etypo & minor stuff📊 Changes
14 files changed (+133 additions, -50 deletions)
View changed files
📝
.gitmodules(+4 -1)📝
CMakeLists.txt(+6 -1)📝
externals/CMakeLists.txt(+5 -0)➕
externals/discord-rpc(+1 -0)📝
src/common/config.cpp(+12 -0)📝
src/common/config.h(+2 -0)➖
src/common/discord.cpp(+0 -43)➕
src/common/discord_rpc_handler.cpp(+57 -0)📝
src/common/discord_rpc_handler.h(+8 -5)📝
src/emulator.cpp(+10 -0)📝
src/qt_gui/main_window.cpp(+8 -0)📝
src/qt_gui/main_window.h(+1 -0)📝
src/qt_gui/settings_dialog.cpp(+12 -0)📝
src/qt_gui/settings_dialog.ui(+7 -0)📄 Description
No description provided
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.