From ac7a2d15cb8acdd4acc0130dc95e4f00b38ce1ea Mon Sep 17 00:00:00 2001 From: Elliot Murphy Date: Thu, 1 Oct 2020 23:45:01 -0400 Subject: [PATCH 1/4] Remove unreachable code in keyboard shortcuts Signed-off-by: Elliot Murphy --- main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.js b/main.js index 3e33998..61ae6b2 100644 --- a/main.js +++ b/main.js @@ -161,8 +161,6 @@ document.addEventListener("keydown", event => { } else { toggleMute(); // Windows } - } else if (event.keyCode == 77) { // m - toggleMute(); // } else if (event.keyCode == 69) { // e // hangup(); } else if (event.keyCode == 66) { // b From 1d4b0dd02ff37d26af3a241cd1b08673b7e30327 Mon Sep 17 00:00:00 2001 From: Elliot Murphy Date: Thu, 1 Oct 2020 23:45:54 -0400 Subject: [PATCH 2/4] Fix spelling typo Signed-off-by: Elliot Murphy --- LICENCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENCE.md b/LICENCE.md index d84cd9f..24b2a39 100644 --- a/LICENCE.md +++ b/LICENCE.md @@ -1,7 +1,7 @@ The OBS.Ninja source repository is governed by the GNU AFFERO GENERAL PUBLIC LICENSE. (AGPL-3.0) That AGPL-3.0 licence can be found here: https://raw.githubusercontent.com/steveseguin/obsninja/master/AGPLv3.md -In essence, OBS.Ninja is open-source and free to use, both for commericial and non-commericial use. +In essence, OBS.Ninja is open-source and free to use, both for commercial and non-commercial use. Modifications of AGPL-3.0 licenced code must be made publicly accessible. Please refer to that licence. Some individual source files may contain different licencing term and perhaps different copyright holders. From dc63c510c0840e005f55ace70edc6131ca96bca2 Mon Sep 17 00:00:00 2001 From: Elliot Murphy Date: Thu, 1 Oct 2020 23:50:46 -0400 Subject: [PATCH 3/4] Link to new podcast series Signed-off-by: Elliot Murphy --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a41e6fd..13cc150 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ Also check out the FAQ for more info: https://github.com/steveseguin/obsninja/wi ## How to use: I demo the basic usage of OBS.Ninja on YouTube: https://www.youtube.com/watch?v=6R_sQKxFAhg +Here is a podcast series showing how to use different OBS.Ninja features: https://www.youtube.com/watch?v=XfSqufuoV74&list=PLWodc2tCfAH1l_LDvEyxEqFf42hOBKqQM + Check the subreddit for added use cases, advanced features, and support. Advanced features includes high-quality audio modes, custom video resolutions, and more. MacOS users will face some challenges in using OBS currently, but there are workarounds. Please see the subreddit or the Wiki. From 706d19bfd424611245943ba955c57422b8ef063f Mon Sep 17 00:00:00 2001 From: Elliot Murphy Date: Thu, 1 Oct 2020 23:51:21 -0400 Subject: [PATCH 4/4] Specify which macOS OBS versions need workaround This should make the docs a bit more resilient against confusion with future OBS releases. Signed-off-by: Elliot Murphy --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13cc150..f9cdf9f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here is a podcast series showing how to use different OBS.Ninja features: https: Check the subreddit for added use cases, advanced features, and support. Advanced features includes high-quality audio modes, custom video resolutions, and more. -MacOS users will face some challenges in using OBS currently, but there are workarounds. Please see the subreddit or the Wiki. +MacOS users will face some challenges in using OBS 25/26, but there are workarounds. Please see the subreddit or the Wiki. ## What's in this repo? This repo contains software for OBS.Ninja, including the HTML landing page for its Electron Capture app offering. A sample config file and instructions for setting up a TURN server (video relay server), is also provided. You may also find the Wiki for the project in this repo, which contains added information on how to use the software.