From 79f29abcba91bd835cb05b4635874c829fe5233c Mon Sep 17 00:00:00 2001 From: crueter Date: Wed, 1 Apr 2026 21:02:20 +0200 Subject: [PATCH 1/6] [core] Fix renderdoc API garbage (#3816) Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3816 --- src/core/tools/renderdoc.cpp | 8 +++++--- src/core/tools/renderdoc.h | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/tools/renderdoc.cpp b/src/core/tools/renderdoc.cpp index 5fab291fe5..4d91956902 100644 --- a/src/core/tools/renderdoc.cpp +++ b/src/core/tools/renderdoc.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project @@ -51,10 +51,12 @@ void RenderdocAPI::ToggleCapture() { if (!rdoc_api) [[unlikely]] { return; } + + auto* api = static_cast(rdoc_api); if (!is_capturing) { - rdoc_api->StartFrameCapture(NULL, NULL); + api->StartFrameCapture(NULL, NULL); } else { - rdoc_api->EndFrameCapture(NULL, NULL); + api->EndFrameCapture(NULL, NULL); } is_capturing = !is_capturing; } diff --git a/src/core/tools/renderdoc.h b/src/core/tools/renderdoc.h index 689b0a383a..1f72bef320 100644 --- a/src/core/tools/renderdoc.h +++ b/src/core/tools/renderdoc.h @@ -6,8 +6,6 @@ #pragma once -struct RENDERDOC_API_1_7_0; - namespace Tools { class RenderdocAPI { @@ -18,7 +16,7 @@ public: void ToggleCapture(); private: - RENDERDOC_API_1_7_0* rdoc_api{}; + void* rdoc_api{}; bool is_capturing{false}; }; From 9ace6742d7ee764c6a5bc38b21fff7cf874f4f1f Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 1 Apr 2026 21:59:37 +0200 Subject: [PATCH 2/6] [docs] update multiplayer section with metaserver info (#3722) Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3722 Reviewed-by: DraVee Reviewed-by: crueter Co-authored-by: lizzie Co-committed-by: lizzie --- docs/Deps.md | 2 +- docs/user/Multiplayer.md | 50 ++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/docs/Deps.md b/docs/Deps.md index a34e838534..80caf1685f 100644 --- a/docs/Deps.md +++ b/docs/Deps.md @@ -334,7 +334,7 @@ pacman -Syuu --needed --noconfirm $packages HaikuOS ```sh -pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel +pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel ``` [Caveats](./Caveats.md#haikuos). diff --git a/docs/user/Multiplayer.md b/docs/user/Multiplayer.md index a501ba1d02..57c4495f46 100644 --- a/docs/user/Multiplayer.md +++ b/docs/user/Multiplayer.md @@ -56,7 +56,7 @@ Use this when you need to connect to a multiplayer room for LDN functionality in - Multiplayer Options Configured in Eden Settings - Network Access -## Steps +### Steps There are 2 primary methods that you can use to connect to an existing room, depending on how the room is hosted. - Joining a Public Lobby @@ -70,7 +70,7 @@ There are 2 primary methods that you can use to connect to an existing room, dep -### Joining a Public Lobby +## Joining a Public Lobby 1. Open Eden and navigate to *Multiplayer → Browse Public Game Lobby*. 2. The **Public Room Browser** will now open and display a list of publicly accessible rooms. Find one you want to connect to and double click it. @@ -90,7 +90,7 @@ If the hoster has not made the lobby public, or you don't want to find it in the --- -# Hosting a Multiplayer Room +## Hosting a Multiplayer Room Use this guide for when you want to host a multiplayer lobby to play with others in Eden. In order to have someone access the room from outside your local network, see the *Access Your Multiplayer Room Externally* section for next steps. **Click [Here](https://evilperson1337.notion.site/Hosting-a-Multiplayer-Room-2c357c2edaf6819481dbe8a99926cea2) for a version of this guide with images & visual elements.** @@ -100,7 +100,7 @@ Use this guide for when you want to host a multiplayer lobby to play with others - Network Access - Ability to allow programs through the firewall on your device. -## Steps +### Steps 1. Open Eden and navigate to *Emulation → Multiplayer → Create Room.* 2. Fill out the following information in the popup dialog box. @@ -120,7 +120,7 @@ Use this guide for when you want to host a multiplayer lobby to play with others --- -# Access Your Multiplayer Room Externally +## Access Your Multiplayer Room Externally Quite often the person with whom you want to play is located off of your internal network (LAN). If you want to host a room and play with them you will need to get your devices to communicate with each other. This guide will go over your options on how to do this so that you can play together. **Click [Here](https://evilperson1337.notion.site/Access-Your-Multiplayer-Room-Externally-2c357c2edaf681c0ab2ce2ee624d809d) for a version of this guide with images & visual elements.** @@ -129,9 +129,9 @@ Quite often the person with whom you want to play is located off of your interna - Eden set up and Functioning - Network Access -## Options +### Options -### Port Forwarding +#### Port Forwarding - **Difficulty Level**: High @@ -148,8 +148,9 @@ The process works by creating a static mapping—often called a “port-forward For our purposes we would pick the port we want to expose (*e.g. 24872*) and we would access our router's configuration and create a port-forward rule to send the traffic from an external connection to your local machine over our specified port (*24872)*. The exact way to do so, varies greatly by router manufacturer - and sometimes require contacting your ISP to do so depending on your agreement. You can look up your router on [*portforward.com*](https://portforward.com/router.htm) which may have instructions on how to do so for your specific equipment. If it is not there, you will have to use Google/ChatGPT to determine the steps for your equipment. +Remember you can't have one port open for multiple devices at the same time - you must only host from one device (or do more convoluted networking which we will not cover here). -### Use a Tunnelling Service +#### Use a Tunnelling Service - **Difficulty Level**: Easy