Merge pull request #9 from ethanaobrien/main

Update!
This commit is contained in:
Allan Niles 2022-07-20 10:23:37 -06:00 committed by GitHub
commit 212f4e4788
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 22 deletions

View file

@ -2,13 +2,12 @@
<div align = center>
<img src = docs/Logo.png width = 300>
<br>
<br>
[![Badge License]][License]
<br>
Self-hosted **Javascript** emulation for various system.
@ -131,7 +130,7 @@ EJS_BETA = true;
<!-- 🎮 🎮 🎮 🎮 🎮 🎮 🎮 🎮 🎮 Quicklinks 🎮 🎮 🎮 🎮 🎮 🎮 🎮 🎮 🎮 --->
[Configurator]: https://emulatorjs.ga/codehelper
[Configurator]: https://emulatorjs.ga/editor.html
[Contributors]: docs/Contributors.md
[Website]: https://emulatorjs.ga/
[Legacy]: https://coldcast.org/games/1/Super-Mario-Bros

View file

@ -31,7 +31,7 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
'reset': 'Reset',
'disabled': 'Disabled',
'enabled': 'Enabled',
'playNow': 'Play Now'
'playNow': 'Start Game'
},
'listeners': {
'play': null,
@ -3859,8 +3859,9 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
{id: {"b_cr":true},number: 20}
].forEach((a) => {
_0x1093f4.call(this, _0x530042.call(this, '.'.concat(_0x2c1832, ' .').concat(_0x449eac(a.id))),
'touchstart touchend', function(e) {
['touchend'].includes(e.type) ? (_0x3a8e2f(e.target, _0x2ec721, false), window.setTimeout(function() {
'touchstart touchend mousedown mouseup mouseout', function(e) {
if (e.sourceCapabilities.firesTouchEvents && e.type.includes('mouse')) return;
['touchend', 'mouseup', 'mouseout'].includes(e.type) ? (_0x3a8e2f(e.target, _0x2ec721, false), window.setTimeout(function() {
_0x378b5c.syncInput(0, a.number, 0);
}, 30)) : (_0x3a8e2f(e.target, _0x2ec721, true), _0x378b5c.syncInput(0, a.number, 1)), e.stopPropagation();
})
@ -3875,6 +3876,7 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
_0x530042.call(this, ".".concat(_0x449eac({ejs__widgets: true}))).appendChild(menuButton);
var hideTimeout;
_0x1093f4.call(this, menuButton, 'mousedown touchstart', function(e) {
if (e.sourceCapabilities.firesTouchEvents && e.type.includes('mouse')) return;
_0x3a8e2f(e.target, _0x2ec721, true);
clearTimeout(hideTimeout);
_0x5ab74d.toggleControls.call(_0xa88a13, true);
@ -6516,4 +6518,4 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
}();
_0x3dbc76.defaults = {};
_0x17edbf.default = _0x3dbc76;
}
}

1
data/emu-min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -6927,4 +6927,4 @@ d[k>>>24]^e[n>>>16&255]^j[g>>>8&255]^l[h&255]^c[p++],n=d[n>>>24]^e[g>>>16&255]^j
}, _0x17a9ac.prototype.setJitter = function(_0x2d4fd2) {
this.jitter = _0x2d4fd2;
};
}, null, window.EJS_main]).default;
}, null, window.EJS_main]).default;

File diff suppressed because one or more lines are too long

View file

@ -22,6 +22,21 @@
<br>
<br>
![Allan Avatar]
### Co-Owner
***Various Fixes & Additions***
**[![Badge Allan GitHub]][Allan GitHub]**
**[![Badge Allan Website]][Allan Website]**
<br>
<br>
<br>
![Archiver Avatar]
***Documentation Design***
@ -33,19 +48,7 @@
<br>
<br>
<br>
![Allan Avatar]
***Various Fixes & Additions***
**[![Badge Allan GitHub]][Allan GitHub]**
**[![Badge Allan Website]][Allan Website]**
<br>
<br>
<br>
[![Avatar Nekro]][GitHub Nekro]
[![Avatar Grey]][GitHub Grey]