From a4a95ce515c07cc8a69369c636cc6f324516b268 Mon Sep 17 00:00:00 2001 From: laz Date: Sun, 17 Mar 2024 19:00:38 +0100 Subject: [PATCH] fixes --- .../nintendo/nintendo-hotkeys.md | 18 ++-- .../controller-standard-radial.md | 6 +- .../controller-steamdeck-full-radial.md | 85 +++++++++++-------- .../wiki_rd_versions/version_0.8b/0.8.0b.md | 4 +- 4 files changed, 64 insertions(+), 49 deletions(-) diff --git a/wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md b/wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md index 34bb1ef..6fc432c 100644 --- a/wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md +++ b/wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md @@ -18,17 +18,17 @@ What follows is a list of hotkeys: | Function | Button / Combination| Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | :---: | -| Pause / Resume | `SELECT + B` | `CTRL + P` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Take Screenshot | `SELECT + A` | `CTRL + X` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | -| Fullscreen Toggle | `SELECT + Y` | `CTRL + ENTER` | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Open Menu | `SELECT + X` | `CTRL + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu` | -| Quit Emulator | `SELECT + Start` | `CTRL + Q` |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | | +| Pause / Resume | `SELECT + B` | `CTRL + P` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | +| Take Screenshot | `SELECT + A` | `CTRL + X` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` | | +| Fullscreen Toggle | `SELECT + Y` | `CTRL + ENTER` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | +| Open Menu | `SELECT + X` | `CTRL + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu (Legacy)` | +| Quit Emulator | `SELECT + Start` | `CTRL + Q` |`RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` | | | | Previous State Slot | `SELECT + D-Pad Left` | `CTRL + J` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | | Next State Slot | `SELECT + D-Pad Right` | `CTRL + K` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`| -| Increase Emulation Speed | `SELECT + D-Pad Up` | `CTRL + 1` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | -| Decrease Emulation Speed | `SELECT + D-Pad Down` | `CTRL + 2` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | -| Load State | `SELECT + L1` | `CTRL + A` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Save State | `SELECT + R1` | `CTRL + S` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | | +| Increase Emulation Speed | `SELECT + D-Pad Up` | `CTRL + 1` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | +| Decrease Emulation Speed | `SELECT + D-Pad Down` | `CTRL + 2` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | +| Load State | `SELECT + L1` | `CTRL + A` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` | | +| Save State | `SELECT + R1` | `CTRL + S` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` | | | Rewind | `SELECT + L2` | `CTRL + -` | `RetroArch` `Duckstation` | | | Fast forward | `SELECT + R2` | `CTRL + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` | | | Global Radial Menu | `SELECT + Left Joystick` | | Opens the Radial Menu | diff --git a/wiki-rtd/docs/wiki_controllers/radial-menus/controller-standard-radial.md b/wiki-rtd/docs/wiki_controllers/radial-menus/controller-standard-radial.md index e0fe985..6188448 100644 --- a/wiki-rtd/docs/wiki_controllers/radial-menus/controller-standard-radial.md +++ b/wiki-rtd/docs/wiki_controllers/radial-menus/controller-standard-radial.md @@ -19,9 +19,9 @@ Radial Button | Keyboard Command| Emulator Support | Icon | Comment | | F7 | `F7` | `PC-Systems` | | | | F8 | `F8` | `PC-Systems` | | | | F10 | `F10` | `PC-Systems` | | | -| Restart / Reset | `CTRL + R` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | | +| Restart / Reset | `CTRL + R` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | | | Wii Sync Button | `ALT + W` | `Dolphin/Primehack` | | | -| Swap - Dual Screens | `CTRL + TAB` | `RetroArch` `Citra` `MelonDS` `Cemu`| | | -| Change - Dual Screen Layout | `CTRL + L` | `Citra` | | | +| Swap - Dual Screens | `CTRL + TAB` | `RetroArch` `Citra (Legacy)` `MelonDS` `Cemu`| | | +| Change - Dual Screen Layout | `CTRL + L` | `Citra (Legacy)` | | | | Widescreen / Aspect Ratio | `CTRL + W` | `Dolphin/Primehack` `Duckstation` `PCSX2` | | | | Change Disc / Next Disc | `CTRL + D` | `RetroArch` `Dolphin/Primehack` `Duckstation`| | | diff --git a/wiki-rtd/docs/wiki_controllers/radial-menus/controller-steamdeck-full-radial.md b/wiki-rtd/docs/wiki_controllers/radial-menus/controller-steamdeck-full-radial.md index 3f2ab59..799a9ba 100644 --- a/wiki-rtd/docs/wiki_controllers/radial-menus/controller-steamdeck-full-radial.md +++ b/wiki-rtd/docs/wiki_controllers/radial-menus/controller-steamdeck-full-radial.md @@ -20,16 +20,16 @@ The `Quick Menu` or `Quick Access Menu` Menu is the most populated menu. It feat | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | -| Quit Emulator | `Ctrl + Q` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | -| Open Menu | `Ctrl + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu` | | -| Swap Screens | `Ctrl + Tab` | `Citra` `MelonDS` `Cemu` | | -| Take Screenshot | `Ctrl + X` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | -| Save State | `Ctrl + S` |`RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Load State | `Ctrl + A` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Pause / Resume | `Ctrl + P` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Fullscreen Toggle | `Ctrl + Enter` |`Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Restart / Reset | `CTRL + R` |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Escape | `ESC` | `PPSSPP` | | +| Quit Emulator | `Ctrl + Q` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` `PPSSPP` | | +| Open Menu | `Ctrl + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu (Legacy)` `PPSSPP` | | +| Swap Screens | `Ctrl + Tab` | `Citra (Legacy)` `MelonDS` `Cemu` | | +| Take Screenshot | `Ctrl + X` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` | | +| Save State | `Ctrl + S` |`RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2` `PPSSPP` | | +| Load State | `Ctrl + A` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2` `PPSSPP` | | +| Pause / Resume | `Ctrl + P` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | +| Fullscreen Toggle | `Ctrl + Enter` |`Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | +| Restart / Reset | `CTRL + R` |`RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | +| Escape | `ESC` | | | ## State Menu The `State Menu` is the menu where you handle anything to do with saving and loading states. @@ -52,11 +52,11 @@ The `Speed / Frames Menu` is where you find anything related to: emulation speed | :--- | :---: | :---: | :---: | | Fastforward | `Ctrl + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` | | | Rewind | `CTRL + -` | `RetroArch` `Duckstation` | | -| Increase Emulation Speed| `CTRL + 1` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Decrease Emulation Speed| `CTRL + 2` |`Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | | +| Increase Emulation Speed| `CTRL + 1` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` | | +| Decrease Emulation Speed| `CTRL + 2` |`Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` | | | Reset Emulation Speed | `CTRL + 3` | `Duckstation` | | | Disable Emulation Speed Limit | `CTRL + 0` |`Dolphin/Primehack` | | -| Frame limit On/Off | `CTRL + Z` | `PCSX2` `Yuzu` | | +| Frame limit On/Off | `CTRL + Z` | `PCSX2` `Yuzu (Legacy)` | | ## Display / Graphics Menu @@ -64,35 +64,35 @@ The `Display / Graphics Menu` is where you find anything related to: up-scaling/ | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | -| Fullscreen Toggle | `Ctrl + Enter` | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | +| Fullscreen Toggle | `Ctrl + Enter` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | | Increase Resolution / Upscale | `Ctrl + U` | `Dolphin/Primehack` `Duckstation` `PCSX2` | | | Decrease Resolution / Upscale | `Ctrl + Y` | `Dolphin/Primehack` `Duckstation` `PCSX2` | | | Change Widescreen / Aspect Ratio | `Ctrl + W` | `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Swap Screens | `Ctrl + Tab` |`Citra` `MelonDS` `Cemu` | | -| Change Dual Screens Layout | `Ctrl + L` | `Citra`| | | +| Swap Screens | `Ctrl + Tab` |`Citra (Legacy)` `MelonDS` `Cemu` | | +| Change Dual Screens Layout | `Ctrl + L` | `Citra (Legacy)`| | | ## General Menu The `General Menu` or `General Emulation Menu` is where you find various global generic emulation hotkeys: Quit/Exit, Restart, Take Screenshot, Change CD, Pause, Turbo Input, Cheats and Video Recording. | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | -| Quit Emulator | `Ctrl + Q` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | -| Open Menu | `Ctrl + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu` | | -| Take Screenshot | `Ctrl + X` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Restart / Reset | `CTRL + R` |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | +| Quit Emulator | `Ctrl + Q` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` | | +| Open Menu | `Ctrl + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu (Legacy)` | | +| Take Screenshot | `Ctrl + X` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | +| Restart / Reset | `CTRL + R` |`RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | | Change Disc / Next Disc | `CTRL + D` | `RetroArch` `Dolphin/Primehack` `Duckstation` | | | Cheats On/Off | `CTRL + C` | `RetroArch` `Duckstation` | | -| Pause / Resume | `Ctrl + P` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | +| Pause / Resume | `Ctrl + P` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | | | Turbo On/Off | `Ctrl + T` | `Duckstation` | | | Video Recording On/Off | `Ctrl + V` |`RetroArch` `Dolphin/Primehack` `PCSX2` | | ## Steam Deck Menu -The `Steam Deck Menu` is where you find Steam Deck specific functions and general computer hotkeys: Steam Screenshot, Show Steam Deck Keyboard, Escape, Alt + F4, Tab, Enter and F1. Some of these could also be useful inside the various PC emulation emulators. +The `Steam Deck Menu` is where you find Steam Deck specific functions and general PC hotkeys. | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | -| Escape | `ESC` | `PPSSPP` | | +| Escape | `ESC` | | | | Tab | `Tab` | | | | Alt + F4 | `Alt + F4` | | | | F1 | `F1` | | | @@ -110,14 +110,12 @@ The `Switch Menu` here you find hotkeys related to Switch emulation: Change GPU | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | -| Change GPU Accuracy | `Alt + G` | `Yuzu` | | -| Load / Remove Amiibo | `Alt + M` | `Yuzu` | | -| Docked / Undocked Mode | `Alt + D` | `Yuzu` | | +| Change GPU Accuracy | `Alt + G` | `Yuzu (Legacy)` | Ryujinx is working on better hotkeys | +| Load / Remove Amiibo | `Alt + M` | `Yuzu (Legacy)` | Ryujinx is working on better hotkeys | +| Docked / Undocked Mode | `Alt + D` | `Yuzu (Legacy)` | Ryujinx is working on better hotkeys | ### MAME Menu -The `MAME Menu` here find hotkeys related to the MAME standalone emulator: Servicemode and buttons 1-4, Insert None Bills (not credits that is Select) and tilt. - -**MAME SUPPORT IS NOT IN YET WILL BE IN A LATER UPDATE** +The `MAME Menu` here find hotkeys related to the MAME (Standalone) emulator. | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | @@ -128,9 +126,13 @@ The `MAME Menu` here find hotkeys related to the MAME standalone emulator: Servi | Service Button 4 | `Alt + 4` | `MAME` | | | Insert Bill / Note | `Alt + 5` | `MAME` | | | Tilt | `Alt + 6` | `MAME` | | +| Tilt - Player 1 | `Alt + 6` | `MAME` | | +| Tilt - Player 1 | `Alt + 6` | `MAME` | | +| Tilt - Player 1 | `Alt + 6` | `MAME` | | +| Tilt - Player 1 | `Alt + 6` | `MAME` | | ### RetroArch Menu -The `RetroArch Menu` here you find hotkeys related to the RetroArch emulator: RetroArch Cheat Mangement, AI Service and Netplay Host. +The `RetroArch Menu` in here you find hotkeys related to the RetroArch emulator. | Radial Button | Keyboard Command | Emulator Support | Comment | @@ -142,7 +144,7 @@ The `RetroArch Menu` here you find hotkeys related to the RetroArch emulator: Re | Netplay Host On/Off | `Ctrl + H` | `RetroArch` | | ### Gamecube / Wii Menu -The `Gamecube / Wii Menu` here you find hotkeys related to the Dolphin standalone emulator: Golf Mode, Freelook Mode On/Off/Reset, Wii Sync Button and Wii Mote Sideways / Upright. +The `Gamecube / Wii Menu` in here you find hotkeys related to the Dolphin standalone emulator. | Radial Button | Keyboard Command | Emulator Support | Comment | @@ -153,10 +155,13 @@ The `Gamecube / Wii Menu` here you find hotkeys related to the Dolphin standalon | Wii Sync Button | `Alt + W` | `Dolphin/Primehack` | | | Wiimote Upright | `Alt + Z` | `Dolphin/Primehack` | | | Wiimote Sideways | `Alt + X` | `Dolphin/Primehack` | | - +| Wiimote Sync - Player 1 | `Alt + X` | `Dolphin/Primehack` | | +| Wiimote Sync - Player 2 | `Alt + X` | `Dolphin/Primehack` | | +| Wiimote Sync - Player 3 | `Alt + X` | `Dolphin/Primehack` | | +| Wiimote Sync - Player 4 | `Alt + X` | `Dolphin/Primehack` | | ### NDS Menu -The `NDS Menu` here you find hotkeys related to the MelonDS standalone emulator: Send Close/Open Lid, Send Play Microphone and Sunlight + / -. +The `NDS Menu` in here you find hotkeys related to the MelonDS standalone emulator: Send Close/Open Lid, Send Play Microphone and Sunlight + / -. | Radial Button | Keyboard Command | Emulator Support | Comment | @@ -167,9 +172,17 @@ The `NDS Menu` here you find hotkeys related to the MelonDS standalone emulator: | Close/Open Lid | `Alt + L` | `MelonDS` | | ### 3DS Menu -The `3DS Menu` here you find hotkeys related to the Citra standalone emulator: Load and Remove Amiibo +The `3DS Menu` in here you find hotkeys related to the Citra (Legacy Standalone) and Citra-core. | Radial Button | Keyboard Command | Emulator Support | Comment | | :--- | :---: | :---: | :---: | -| Load Amiibo | `Alt + M` |`Citra` | | -| Remove Amiibo | `Alt + N` |`Citra` | | +| Load Amiibo | `Alt + M` |`Citra (Legacy)` | | +| Remove Amiibo | `Alt + N` |`Citra (Legacy)` | | + +### GZDoom Menu +The `GZDoom Menu` in here you find cheat hotkeys for DOOM. + +| Radial Button | Keyboard Command | Engine Support | Comment | +| :--- | :---: | :---: | :---: | +| Give all Items | `IDFA` |`GZDOOM` | | +| Give all Items + Keys | `IDQFA` |`GZDOOM` | | diff --git a/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md b/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md index 655b989..a1c0e8f 100644 --- a/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md +++ b/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md @@ -29,13 +29,15 @@ https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/rpcs3/rpcs3-guid This is a new profile for the Steam Deck with a lighter radial menu on the left touchpad. Some users did not want to have the full radial menu system but would rather just have something more simple. +The profile is called `RetroDECK: Steam Deck - Neptune v.1b SIMPLE` + LINK HERE TO WIKI ## Updates to the Steam Deck Profile: Full Several changes have been made to the now called Full Profile -- Change: Renamed profile <> +- Change: Renamed profile to `RetroDECK: Steam Deck - Neptune v.1b FULL` - Changed versioning to be inline with the other profiles begins at v1b. - Change: MAME Menu - Changed all the binds to reflect new MAME (Standalone) config. - Added: Wii/GC Menu - Wii Mote Sync 1 to 4 buttons.