From 2f2623b3790aa6838956d65f3f9fa0c0625071a8 Mon Sep 17 00:00:00 2001 From: Mary Date: Sun, 30 Aug 2020 18:35:42 +0200 Subject: [PATCH] Clean up and update readme (#1501) * Clean up and update readme THis clean up and improve the README a bit. * Apply suggestions from code review Co-authored-by: EmulationFanatic <62343878+EmulationFanatic@users.noreply.github.com> Co-authored-by: EmulationFanatic <62343878+EmulationFanatic@users.noreply.github.com> --- CONFIG.md | 181 ------------------ README.md | 52 ++--- .../Time/TimeZone/TimeZoneContentManager.cs | 4 +- 3 files changed, 20 insertions(+), 217 deletions(-) delete mode 100644 CONFIG.md diff --git a/CONFIG.md b/CONFIG.md deleted file mode 100644 index 14a51359f5..0000000000 --- a/CONFIG.md +++ /dev/null @@ -1,181 +0,0 @@ -## Config File - -`Config.jsonc` should be present in executable folder. The available settings follow: - -- `graphics_shaders_dump_path` *(string)* - - Dump shaders in local directory (e.g. `C:\ShaderDumps`) - -- `logging_enable_debug` *(bool)* - - Enable the Debug Logging. - -- `logging_enable_stub` *(bool)* - - Enable the Trace Logging. - -- `logging_enable_info` *(bool)* - - Enable the Informations Logging. - -- `logging_enable_warn` *(bool)* - - Enable the Warning Logging. - -- `logging_enable_error` *(bool)* - - Enable the Error Logging. - -- `enable_file_log` *(bool)* - - Enable writing the logging inside a Ryujinx.log file. - -- `system_language` *(string)* - - Change System Language, [System Language list](https://gist.github.com/HorrorTroll/b6e4a88d774c3c9b3bdf54d79a7ca43b) - -- `docked_mode` *(bool)* - - Enable or Disable Docked Mode - -- `enable_vsync` *(bool)* - - Enable or Disable Game Vsync - -- `enable_multicore_scheduling` *(bool)* - - Enable or disable multi-core scheduling of threads - -- `enable_ptc` *(bool)* - - Enable or disable profiled translation cache persistency - -- `enable_fs_integrity_checks` *(bool)* - - Enable integrity checks on Switch content files - -- `controller_type` *(string)* - - The primary controller's type. - Supported Values: `Handheld`, `ProController`, `NpadPair`, `NpadLeft`, `NpadRight` - -- `keyboard_controls` *(object)* : - - `left_joycon` *(object)* : - Left JoyCon Keyboard Bindings - - `stick_up` *(string)* - - `stick_down` *(string)* - - `stick_left` *(string)* - - `stick_right` *(string)* - - `stick_button` *(string)* - - `dpad_up` *(string)* - - `dpad_down` *(string)* - - `dpad_left` *(string)* - - `dpad_right` *(string)* - - `button_minus` *(string)* - - `button_l` *(string)* - - `button_zl` *(string)* - - `right_joycon` *(object)* : - Right JoyCon Keyboard Bindings - - `stick_up` *(string)* - - `stick_down` *(string)* - - `stick_left` *(string)* - - `stick_right` *(string)* - - `stick_button` *(string)* - - `button_a` *(string)* - - `button_b` *(string)* - - `button_x` *(string)* - - `button_y` *(string)* - - `button_plus` *(string)* - - `button_r` *(string)* - - `button_zr` *(string)* - -- `joystick_controls` *(object)* : - - `enabled` *(bool)* - Whether or not to enable Controller Support. - - `index` *(int)* - The index of the Controller Device. - - `deadzone` *(number)* - The deadzone of both analog sticks on the Controller. - - `trigger_threshold` *(number)* - The value of how pressed down each trigger has to be in order to register a button press - - `left_joycon` *(object)* : - Left JoyCon Controller Bindings - - `stick` *(string)* - - `stick_button` *(string)* - - `dpad_up` *(string)* - - `dpad_down` *(string)* - - `dpad_left` *(string)* - - `dpad_right` *(string)* - - `button_minus` *(string)* - - `button_l` *(string)* - - `button_zl` *(string)* - - `right_joycon` *(object)* : - Right JoyCon Controller Bindings - - `stick` *(string)* - - `stick_button` *(string)* - - `button_a` *(string)* - - `button_b` *(string)* - - `button_x` *(string)* - - `button_y` *(string)* - - `button_plus` *(string)* - - `button_r` *(string)* - - `button_zr` *(string)* - -### Default Mapping. - #### Controller - - Left Joycon: - - Analog Stick = Axis 0 - - DPad Up = DPad Up #Hat0 Up - - DPad Down = DPad Down #Hat0 Down - - DPad Left = DPad Left #Hat0 Left - - DPad Right = DPad Right #Hat0 Right - - Minus = Button 10 - - L = Button 6 - - ZL = Button 8 - - - Right Joycon: - - Analog Stick = Axis 2 - - A = Button 0 - - B = Button 1 - - X = Button 3 - - Y = Button 4 - - Plus = Button 11 - - R = Button 7 - - ZR = Button 9 - - #### Keyboard - - Left Joycon: - - Stick Up = W - - Stick Down = S - - Stick Left = A - - Stick Right = D - - Stick Button = F - - DPad Up = Up - - DPad Down = Down - - DPad Left = Left - - DPad Right = Right - - Minus = - - - L = E - - ZL = Q - - - Right Joycon: - - Stick Up = I - - Stick Down = K - - Stick Left = J - - Stick Right = L - - Stick Button = H - - A = Z - - B = X - - X = C - - Y = V - - Plus = + - - R = U - - ZR = O - -### Valid Button Mappings. - - Button# = A button on the controller. # should not exceed the max # of buttons detected on your controller. - - Axis# = An analog axis on the controller. It can be a stick control, or a motion control axis. - - Hat# = A Point of View (POV), Hat or Directional Pad control on the controller. - - Button configuration and controller capabilities differ from one controller to another. Please use a - configuration tool to find out the actual button configuration of your controller. \ No newline at end of file diff --git a/README.md b/README.md index b2e3b8e86f..89d3a0cca7 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,25 @@

- As of June 2020, Ryujinx goes past menus and in-game on over 1,000 commercial titles. Of those, roughly half are considered playable. See the compatiblity list here. + As of August 2020, Ryujinx goes past menus and in-game on over 1,500 commercial titles. Of those, more than half are considered playable. See the compatibility list here.
## Usage To run this emulator, we recommend that your PC have at least 8GB of RAM; less than this amount can result in unpredictable behavior and may cause crashes or unacceptable performance. -If you use a pre-built version, you can use the graphical interface to run your games and homebrew: simply add the directory containing your homebrew or games in the Options > Settings > General tab > Game Directories menu item. -If you build it yourself you will need to: +See our [Setup & Configuration Guide](https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide) on how to set up the emulator. + +## Latest build + +These builds are compiled automatically for each commit on the master branch. While we strive to ensure optimal stability and performance prior to pushing an update, our automated builds **may be unstable or completely broken.** + +The latest automatic build for Windows, macOS, and Linux can be found on the [Official Website](https://ryujinx.org/download). + +## Building + +If you wish to build the emulator yourself you will need to: + **Step one:** Install the [.NET Core 3.1 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet-core). **Step two (choose one):** @@ -39,39 +49,15 @@ Download the ZIP Tarball. Then extract it to a directory of your choice. **Step three:** Build the App using a Command prompt in the project directory. You can quickly access it by holding shift in explorer (in the Ryujinx directory) then right clicking, and typing the following command: -Run `dotnet build -c Release -r win10-x64` inside the Ryujinx project folder to build Ryujinx binaries. +Run `dotnet build -c Release -r win-x64` inside the Ryujinx project folder to build Ryujinx binaries. -Every file related to Ryujinx is stored in the `Ryujinx` folder. This folder is located in the user folder, which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI. - -## Latest build - -These builds are compiled automatically for each commit on the master branch. While we strive to ensure optimal stability and performance prior to pushing an update, our automated builds **may be unstable or completely broken.** - -The latest automatic build for Windows, macOS, and Linux can be found on the [Official Website](https://ryujinx.org/download). - -## Requirements - - - **Switch Keys** - - Everything on the Switch is encrypted, so if you want to run anything other than homebrew, you have to dump encryption keys from your console. To get more information please take a look at our [Keys Documentation](KEYS.md). - - - **Firmware** - - You need an official Switch firmware by either dumping directly from your Switch, or dumping your game cartridge to an XCI file; you may install firmware in Ryujinx directly from an XCI file as long as it has not been trimmed. Install the firmware, after you've installed your keys, from the Tools > Install Firmware menu item. - - - **Executables** - - Ryujinx is able to run both official games and homebrew. - - Homebrew is available on many websites, such as the [Switch Appstore](https://www.switchbru.com/appstore/). - - A hacked Nintendo Switch is needed to dump games, which you can learn how to do [here](https://nh-server.github.io/switch-guide/). Once you have hacked your Nintendo Switch, you will need to dump your own games with [NxDumpTool](https://github.com/DarkMatterCore/nxdumptool/releases) to get an XCI or NSP dump. +Ryujinx system files are stored in the `Ryujinx` folder. This folder is located in the user folder, which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI. ## Features - **Audio** - Audio is partially supported. We use C# wrappers for [OpenAL](https://openal.org/downloads/OpenAL11CoreSDK.zip) (installation needed), the main audio backend, and [libsoundio](http://libsound.io/) as the fallback. Our current Opus implementation is incomplete. + Audio output is entirely supported, audio input (microphone) isn't supported. We use C# wrappers for [OpenAL](https://openal.org/downloads/oalinst.zip) (installation needed), and [libsoundio](http://libsound.io/) as the fallback. - **CPU** @@ -97,8 +83,6 @@ The latest automatic build for Windows, macOS, and Linux can be found on the [Of The emulator has settings for enabling or disabling some logging, remapping controllers, and more. You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the user folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI. - For more information [you can go here](CONFIG.md) *(Outdated)*. - ## Compatibility You can check out the compatibility list [here](https://github.com/Ryujinx/Ryujinx-Games-List/issues). @@ -107,9 +91,9 @@ Don't hesitate to open a new issue if a game isn't already on there. ## Help -If you have homebrew or a particular game marked playable or in-game in our compatibility list that doesn't work within the emulator, you can contact us through our Discord. We'll take note of whatever is causing the app/game to not work, put it on the watch list and fix it at a later date. +If you are having problems launching homebrew or a particular game marked status-playable or status-ingame in our compatibility list, you can contact us through our [Discord server](https://discord.gg/N2FmfVc). We'll take note of whatever is causing the app/game to not work, put it on the watch list and fix it at a later date. -If you need help with setting up Ryujinx, you can ask questions in the #support channel of our Discord server. +If you need help with setting up Ryujinx, you can ask questions in the #support channel of our [Discord server](https://discord.gg/N2FmfVc). ## Contact diff --git a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs index bce4341bc0..26a354da38 100644 --- a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs +++ b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone { private const long TimeZoneBinaryTitleId = 0x010000000000080E; - private readonly string TimeZoneSystemTitleMissingErrorMessage = "TimeZoneBinary system title not found! TimeZone conversions will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx#requirements for more information)"; + private readonly string TimeZoneSystemTitleMissingErrorMessage = "TimeZoneBinary system title not found! TimeZone conversions will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide#initial-setup-continued---installation-of-firmware for more information)"; private VirtualFileSystem _virtualFileSystem; private IntegrityCheckLevel _fsIntegrityCheckLevel; @@ -300,4 +300,4 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone return result; } } -} \ No newline at end of file +}