6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-11-25 03:34:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://104.131.86.119:2222/home/pzp/git/8bitworkshop

Browse Source
This commit is contained in:
Steven Hugg 2019-07-06 14:19:56 -04:00
commit 9d35615bc4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -255,14 +255,14 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<div class="emucontrols-nes text-center small control-insns" style="display:none"> <div class="emucontrols-nes text-center small control-insns" style="display:none">
<span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joypad</span> <span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joypad</span>
<span class="control-def"><span class="control-key small">Space</span> Button A</span> <span class="control-def"><span class="control-key small">Space</span> Button A</span>
<span class="control-def"><span class="control-key small">Ctrl</span> Button B</span> <span class="control-def"><span class="control-key small">Shift</span> Button B</span>
<span class="control-def"><span class="control-key small">\</span> Select</span> <span class="control-def"><span class="control-key small">\</span> Select</span>
<span class="control-def"><span class="control-key small">Enter</span> Start</span> <span class="control-def"><span class="control-key small">Enter</span> Start</span>
</div> </div>
<div class="emucontrols-vicdual emucontrols-galaxian emucontrols-vector text-center small control-insns" style="display:none"> <div class="emucontrols-vicdual emucontrols-galaxian emucontrols-vector text-center small control-insns" style="display:none">
<span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joystick</span> <span class="control-def"><span class="control-key">&#x2190;&#x2191;&#x2193;&#x2192;</span> Joystick</span>
<span class="control-def"><span class="control-key small">Space</span> Button 1</span> <span class="control-def"><span class="control-key small">Space</span> Button 1</span>
<span class="control-def"><span class="control-key small">Ctrl</span> Button 2</span> <span class="control-def"><span class="control-key small">Shift</span> Button 2</span>
<span class="control-def"><span class="control-key">\</span> Coin</span> <span class="control-def"><span class="control-key">\</span> Coin</span>
<span class="control-def"><span class="control-key small">Enter</span> Start</span> <span class="control-def"><span class="control-key small">Enter</span> Start</span>
</div> </div>

2
src/emu.ts
View File

@ -342,7 +342,7 @@ export const Keys : {[keycode:string]:KeyDef} = {
LEFT: {c: 37, n: "Left", plyr:0, xaxis:-1}, LEFT: {c: 37, n: "Left", plyr:0, xaxis:-1},
RIGHT: {c: 39, n: "Right", plyr:0, xaxis:1}, RIGHT: {c: 39, n: "Right", plyr:0, xaxis:1},
A: {c: 32, n: "Space", plyr:0, button:0}, A: {c: 32, n: "Space", plyr:0, button:0},
B: {c: 17, n: "Ctrl", plyr:0, button:1}, B: {c: 16, n: "Shift", plyr:0, button:1},
GP_A: {c: 88, n: "X", plyr:0, button:0}, GP_A: {c: 88, n: "X", plyr:0, button:0},
GP_B: {c: 90, n: "Z", plyr:0, button:1}, GP_B: {c: 90, n: "Z", plyr:0, button:1},
SELECT: {c: 220, n: "\\", plyr:0, button:8}, SELECT: {c: 220, n: "\\", plyr:0, button:8},