Skip to content

Commit 389bf0e

Browse files
committed
soon(tm) is now (6.4)
Sorry it took so long to get this update done. Changes in this update: - ability to change keybinds - take and download screenshots - recover saves and states from lost or renamed roms - shaders added to bundle - disable webcam usage for gameboy
1 parent 65ab91c commit 389bf0e

23 files changed

+40583
-90
lines changed

assets/base.css

Lines changed: 224 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,12 @@ input[type="file"] {
280280
cursor: pointer;
281281
}
282282

283-
.upload+.uploadlabel {
283+
.uploadimage {
284+
width: 20px;
285+
vertical-align: middle;
286+
}
287+
288+
#upload {
284289
border: 1px solid rgb(118, 118, 118);
285290
border-radius: 2px;
286291
padding: 4px;
@@ -289,15 +294,10 @@ input[type="file"] {
289294
transition: ease .1s;
290295
}
291296

292-
.upload+.uploadlabel:hover {
297+
#upload:hover {
293298
background-color: #eee;
294299
}
295300

296-
.uploadimage {
297-
width: 20px;
298-
vertical-align: middle;
299-
}
300-
301301
#ffdcontent {
302302
height: calc(100% - 45px);
303303
padding: 10px;
@@ -425,3 +425,220 @@ body.paused #resume {
425425
z-index: 8;
426426
display: none;
427427
}
428+
429+
#modals {
430+
background-color: rgba(255, 255, 255, 0.5);
431+
position: absolute;
432+
width: 100%;
433+
height: 100%;
434+
left: 0px;
435+
right: 0px;
436+
top: 0px;
437+
bottom: 0px;
438+
overflow: hidden;
439+
z-index: 30;
440+
display: none;
441+
}
442+
443+
#managers {
444+
background-color: white;
445+
position: absolute;
446+
top: 50%;
447+
left: 50%;
448+
transform: translate(-50%, -50%);
449+
height: calc(100vh - 50px);
450+
}
451+
452+
.modaltop {
453+
height: 30px;
454+
line-height: 30px;
455+
padding: 10px;
456+
}
457+
458+
.modaltop h2 {
459+
display: inline;
460+
margin: 5px;
461+
text-transform: capitalize;
462+
}
463+
464+
.modaltop span {
465+
float: right;
466+
display: inline-block;
467+
width: 30px;
468+
text-align: center;
469+
cursor: pointer;
470+
font-size: 24px;
471+
}
472+
473+
#keybindmanager, #screenshotmanager, #savemanager {
474+
height: calc(100% - 90px);
475+
padding: 20px;
476+
padding-top: 10px;
477+
}
478+
479+
#keybindmanager {
480+
display: none;
481+
width: 500px;
482+
}
483+
484+
#screenshotmanager {
485+
display: none;
486+
width: 1000px;
487+
}
488+
489+
#savemanager {
490+
display: none;
491+
width: 750px;
492+
}
493+
494+
.managertableparent {
495+
height: calc(100% - 78px);
496+
width: 100%;
497+
display: block;
498+
overflow: auto;
499+
margin-bottom: 20px;
500+
}
501+
502+
.managertable {
503+
box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 16, 0.15);
504+
display: block;
505+
width: 100%;
506+
vertical-align: top;
507+
}
508+
509+
.managertable tr {
510+
display: block;
511+
width: 100%;
512+
}
513+
514+
.managertable td {
515+
display: inline-block;
516+
height: 100%;
517+
padding: 2px;
518+
padding-left: 6px;
519+
white-space: nowrap;
520+
overflow-x: auto;
521+
522+
scrollbar-width: none;
523+
}
524+
525+
#keybindtable td {
526+
width: calc(50% - 8px);
527+
}
528+
529+
.managertable td::-webkit-scrollbar {
530+
display: none;
531+
}
532+
533+
.managertable tr:nth-child(even) {
534+
background-color: #ace9fa;
535+
}
536+
537+
.managertable td:nth-child(even) {
538+
background-color: rgba(0, 0, 0, 0.05);
539+
}
540+
541+
#keybindtable td:last-child {
542+
cursor: pointer;
543+
}
544+
545+
#keybindtable td:last-child:hover {
546+
background-color: rgba(0, 0, 0, 0.1);
547+
}
548+
549+
#savetable tr {
550+
display: flex;
551+
}
552+
553+
#savetable td:first-child {
554+
flex-grow: 1;
555+
}
556+
557+
#savetable td:last-child {
558+
flex-shrink: 0;
559+
padding-left: 2px;
560+
}
561+
562+
#savetable td:last-child span {
563+
cursor: pointer;
564+
margin: 4px;
565+
padding: 1px 4px;
566+
user-select: none;
567+
background: white;
568+
background: linear-gradient(#ffffff, #f3f3f3);
569+
}
570+
571+
#savetable td:last-child span:active {
572+
background: linear-gradient(#f3f3f3, #ffffff);
573+
}
574+
575+
#modals input[type="button"] {
576+
background-color: white;
577+
border-radius: 0px;
578+
border: 2px solid black;
579+
padding: 4px 8px;
580+
cursor: pointer;
581+
}
582+
583+
#modals input[type="button"]:active {
584+
background-color: #efefef;
585+
}
586+
587+
#modals .specialblue {
588+
background-color: #1e90ff !important;
589+
color: white;
590+
}
591+
592+
#modals input[type="button"].specialblue:active {
593+
background-color: #0e80ef !important;
594+
}
595+
596+
#keybindtable .conflict {
597+
color: red;
598+
}
599+
600+
#keybindmanager h4 {
601+
margin-top: 0px;
602+
}
603+
604+
#screenshotsdiv {
605+
background-color: pink;
606+
height: calc(100% - 40px);
607+
width: calc(100% + 20px);
608+
overflow-y: auto;
609+
overflow-x: hidden;
610+
margin-bottom: 20px;
611+
display: flex;
612+
flex-wrap: wrap;
613+
background-color: #efefef;
614+
box-shadow: inset -20px 0px 0px 0px white;
615+
}
616+
617+
#screenshotmanager h4 {
618+
display: inline-block;
619+
margin: 0px;
620+
margin-right: 10px;
621+
}
622+
623+
#screenshotsdiv .screenshot {
624+
width: 180px;
625+
height: min-content;
626+
padding: 10px;
627+
image-rendering: crisp-edges;
628+
image-rendering: pixelated;
629+
}
630+
631+
#screenshotsdiv .screenshot img {
632+
width: 180px;
633+
display: block;
634+
}
635+
636+
#screenshotsdiv .screenshot input[type="button"] {
637+
width: 180px;
638+
display: block;
639+
margin-top: 5px;
640+
}
641+
642+
dji-cowriter {
643+
display: none !important;
644+
}

assets/base.js

Lines changed: 417 additions & 48 deletions
Large diffs are not rendered by default.

assets/charToCodeMap.js

Lines changed: 114 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,117 @@ var charToCodeMap = {
101101
var charToKeyMap = {
102102
"\t": {key: "Tab"},
103103
"\n": {key: "Enter"}
104-
};
104+
};
105+
106+
var codeToConfigIDMap = {
107+
"KeyA": "a",
108+
"KeyB": "b",
109+
"KeyC": "c",
110+
"KeyD": "d",
111+
"KeyE": "e",
112+
"KeyF": "f",
113+
"KeyG": "g",
114+
"KeyH": "h",
115+
"KeyI": "i",
116+
"KeyJ": "j",
117+
"KeyK": "k",
118+
"KeyL": "l",
119+
"KeyM": "m",
120+
"KeyN": "n",
121+
"KeyO": "o",
122+
"KeyP": "p",
123+
"KeyQ": "q",
124+
"KeyR": "r",
125+
"KeyS": "s",
126+
"KeyT": "t",
127+
"KeyU": "u",
128+
"KeyV": "v",
129+
"KeyW": "w",
130+
"KeyX": "x",
131+
"KeyY": "y",
132+
"KeyZ": "z",
133+
"ArrowLeft": "left",
134+
"ArrowRight": "right",
135+
"ArrowUp": "up",
136+
"ArrowDown": "down",
137+
"Enter": "enter",
138+
"NumpadEnter": "kp_enter",
139+
"Tab": "tab",
140+
"Insert": "insert",
141+
"Delete": "del",
142+
"End": "end",
143+
"Home": "home",
144+
"ShiftRight": "rshift",
145+
"ShiftLeft": "shift",
146+
"ControlLeft": "ctrl",
147+
"AltLeft": "alt",
148+
"Space": "space",
149+
"Escape": "escape",
150+
"NumpadAdd": "add",
151+
"NumpadSubtract": "subtract",
152+
"F1": "f1",
153+
"F2": "f2",
154+
"F3": "f3",
155+
"F4": "f4",
156+
"F5": "f5",
157+
"F6": "f6",
158+
"F7": "f7",
159+
"F8": "f8",
160+
"F9": "f9",
161+
"F10": "f10",
162+
"F11": "f11",
163+
"F12": "f12",
164+
"Digit0": "num0",
165+
"Digit1": "num1",
166+
"Digit2": "num2",
167+
"Digit3": "num3",
168+
"Digit4": "num4",
169+
"Digit5": "num5",
170+
"Digit6": "num6",
171+
"Digit7": "num7",
172+
"Digit8": "num8",
173+
"Digit9": "num9",
174+
"PageUp": "pageup",
175+
"PageDown": "pagedown",
176+
"Numpad0": "keypad0",
177+
"Numpad1": "keypad1",
178+
"Numpad2": "keypad2",
179+
"Numpad3": "keypad3",
180+
"Numpad4": "keypad4",
181+
"Numpad5": "keypad5",
182+
"Numpad6": "keypad6",
183+
"Numpad7": "keypad7",
184+
"Numpad8": "keypad8",
185+
"Numpad9": "keypad9",
186+
"Period": "period",
187+
"CapsLock": "capslock",
188+
"NumLock": "numlock",
189+
"Backspace": "backspace",
190+
"NumpadMultiply": "multiply",
191+
"NumpadDivide": "divide",
192+
"PrintScreen": "print_screen",
193+
"ScrollLock": "scroll_lock",
194+
"Backquote": "tilde",
195+
"Pause": "pause",
196+
"Quote": "quote",
197+
"Comma": "comma",
198+
"Minus": "minus",
199+
"Slash": "slash",
200+
"Semicolon": "semicolon",
201+
"Equal": "equals",
202+
"BracketLeft": "leftbracket",
203+
"Backslash": "backslash",
204+
"BracketRight": "rightbracket",
205+
"NumpadDecimal": "kp_period",
206+
"NumpadEqual": "kp_equals",
207+
"ControlRight": "rctrl",
208+
"AltRight": "ralt",
209+
"F13": "f13",
210+
"F14": "f14",
211+
"F15": "f15",
212+
"MetaRight": "rmeta",
213+
"MetaLeft": "lmeta",
214+
"Help": "help",
215+
"ContextMenu": "menu",
216+
"Power": "power"
217+
};

assets/icon102.png

2.49 KB
Loading

assets/icon204.png

3 KB
Loading

assets/info.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"infoVer": 1,
3-
"webretro": 6.3,
3+
"webretro": 6.4,
44
"versions": {
55
"6": {
66
"changeList": ["replace vba_next with mgba for gb and gbc support", "rebuilt with undo save/load state, toggle menu", "absolute url support for rom query", "canvas mask for pause screen and alerts", "point to menu on first time use", "source overrides included in repository"]
@@ -13,6 +13,9 @@
1313
},
1414
"6.3": {
1515
"changeList": ["remove missing assets warning"]
16+
},
17+
"6.4": {
18+
"changeList": ["ability to change keybinds", "take and download screenshots", "recover saves and states from lost or renamed roms", "shaders added to bundle", "disable webcam usage for gameboy"]
1619
}
1720
}
1821
}

genesis_plus_gx_libretro.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

genesis_plus_gx_libretro.wasm

37 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)