Merge remote-tracking branch 'origin/main' into v/267

open-goal · Sep 22, 2024 · a529fb9 · a529fb9
2 parents dcb7dc6 + 465092d
commit a529fb9
Show file tree

Hide file tree

Showing 31 changed files with 695 additions and 446 deletions.
diff --git a/README.md b/README.md
@@ -6,12 +6,14 @@ Our attempt at distributing the [OpenGOAL](https://github.com/open-goal/jak-proj
 
 The launcher uses the [Tauri](https://tauri.app/) framework.
 
-- [Usage](#usage)
-- [Asking for help](#asking-for-help)
-- [Development](#development)
-  - [Windows](#windows)
-  - [Linux (Ubuntu 22.04)](#linux-ubuntu-2204)
-  - [Building and Running](#building-and-running)
+- [OpenGOAL Launcher](#opengoal-launcher)
+  - [Usage](#usage)
+  - [Asking for help](#asking-for-help)
+  - [Development](#development)
+    - [Windows](#windows)
+    - [Linux (Ubuntu 22.04)](#linux-ubuntu-2204)
+    - [macOS](#macos)
+    - [Building and Running](#building-and-running)
 
 ## Usage
 
@@ -53,6 +55,12 @@ nvm install lts/hydrogen # installs latest nodejs 18.X
 npm install -g yarn
 ```
 
+### macOS
+
+```bash
+npm install -g yarn
+```
+
 ### Building and Running
 
 To build and run the application locally, all you have to do is run:

diff --git a/docs/default-keybinds.png b/docs/default-keybinds.png
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -43,6 +43,7 @@ zip = { version = "2.2.0", features = ["deflate-zlib-ng"] }
 zip-extract = "0.2.1"
 tempfile = "3.12.0"
 native-dialog = "0.7.0"
+tokio-util = "0.7.12"
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.52.0"