Merge branch 'ethanaobrien:main' into main

This commit is contained in:
Allan Niles 2022-03-01 08:56:44 -07:00 committed by GitHub
commit 1dd6d111a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -24,7 +24,7 @@ When reporting bugs, please specify that you are using the beta version
--- ---
**⸢ [Example Use] ⸥ ⸢ [Emulator Demo] ⸥ ⸢ [Beta] ⸥** **⸢ [EmulatorJS Website] ⸥ ⸢ [Example Use] ⸥ ⸢ [Emulator Demo] ⸥ ⸢ [Beta] ⸥**
--- ---
@ -83,7 +83,7 @@ EJS_gameID = 1;
<br> <br>
by default, the netplay server url will be `emulatorjs.herokuapp.com`, but to default to the default `ws.emulatorjs.com` server add the following line by default, the netplay server url will be `emuserver.emulatorjs.ga`, but to default to the default `ws.emulatorjs.com` server add the following line
```js ```js
EJS_oldEJSNetplayServer = true; EJS_oldEJSNetplayServer = true;
@ -202,9 +202,10 @@ If I find a repository that does not follow the licence, I will report it.
<!-----------------------------------------------------------------------------> <!----------------------------------------------------------------------------->
[EmulatorJS Website]: https://emulatorjs.ga/
[Example Use]: https://coldcast.org/games/1/Super-Mario-Bros [Example Use]: https://coldcast.org/games/1/Super-Mario-Bros
[Emulator Demo]: https://ethanaobrien.github.io/emulatorjs/ [Emulator Demo]: https://emulatorjs.ga/demo/
[Beta]: https://emulatorjs.netlify.app/ [Beta]: https://emulatorjs.ga/beta/
[Issue]: https://github.com/ethanaobrien/emulatorjs/issues [Issue]: https://github.com/ethanaobrien/emulatorjs/issues
[This repository]: https://github.com/linuxserver/emulatorjs [This repository]: https://github.com/linuxserver/emulatorjs