diff options
| author | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2025-04-11 05:34:29 -0300 |
|---|---|---|
| committer | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2025-04-11 05:34:29 -0300 |
| commit | 9fc9b3cf806b56c1a975d77dbc23c282e8304759 (patch) | |
| tree | 0e4b80fc942ef9c14cea2315244a3dd1d24cb750 | |
| parent | af686894f2048db4e5094eaa9c86de0285b72646 (diff) | |
| parent | 3ed131d67f50e32d3388d8625c71af118c7cdce3 (diff) | |
Merge branch 'main' of https://github.com/HarbourMasters/Starship
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/port/Engine.cpp | 4 | ||||
| -rw-r--r-- | src/port/ui/ImguiUI.cpp | 8 |
3 files changed, 6 insertions, 8 deletions
@@ -51,9 +51,9 @@ Congratulations, you are now sailing with Starship! Have fun! | Keys | Action | | - | - | | F1 | Toggle menubar | +| F4 | Reset | | F11 | Fullscreen | | Tab | Toggle Alternate assets | -| Ctrl+R | Reset | ### Graphics Backends Currently, there are three rendering APIs supported: DirectX11 (Windows), OpenGL (all platforms), and Metal (macOS). You can change which API to use in the `Settings` menu of the menubar, which requires a restart. If you're having an issue with crashing, you can change the API in the `starship.cfg.json` file by finding the line `"Backend":{`... and changing the `id` value to `3` and set the `Name` to `OpenGL`. `DirectX 11` with id `2` is the default on Windows. `Metal` with id `4` is the default on macOS. diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp index 4a370d29..de023957 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -326,6 +326,10 @@ void GameEngine::StartFrame() const { CVarSetInteger("gEnhancements.Mods.AlternateAssets", !CVarGetInteger("gEnhancements.Mods.AlternateAssets", 0)); break; } + case KbScancode::LUS_KB_F4: { + gNextGameState = GSTATE_BOOT; + break; + } default: break; } diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp index dd062788..1748523a 100644 --- a/src/port/ui/ImguiUI.cpp +++ b/src/port/ui/ImguiUI.cpp @@ -423,13 +423,7 @@ void DrawMenuBarIcon() { void DrawGameMenu() { if (UIWidgets::BeginMenu("Starship")) { - if (UIWidgets::MenuItem("Reset", -#ifdef __APPLE__ - "Command-R" -#else - "Ctrl+R" -#endif - )) { + if (UIWidgets::MenuItem("Reset", "F4")) { gNextGameState = GSTATE_BOOT; } #if !defined(__SWITCH__) && !defined(__WIIU__) |