resolved merge conflict and inGame boolean now functions as intended

This commit is contained in:
MonkeyGG2
2023-09-08 21:15:39 -04:00
5 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -232,7 +232,7 @@ img[alt="Proxy Icon"] {
font-family: var(--font-family); font-family: var(--font-family);
transition: all 0.2s ease-in; transition: all 0.2s ease-in;
cursor: pointer; cursor: pointer;
} }
.card h5 { .card h5 {
font-size: 2rem; font-size: 2rem;
@@ -242,6 +242,7 @@ img[alt="Proxy Icon"] {
.card:hover { .card:hover {
background-color: var(--hover-color); background-color: var(--hover-color);
transform: scale(1.05);
} }
#page-loader iframe { #page-loader iframe {
+1 -1
View File
@@ -151,7 +151,7 @@ function setup() {
Draw Draw
--------------------*/ --------------------*/
let inGame = true; let inGame = false;
function draw() { function draw() {
if (!inGame && document.visibilityState == "visible") { if (!inGame && document.visibilityState == "visible") {
time++; time++;
+1
View File
@@ -23,6 +23,7 @@ fetch("./game-info.jsonc").then((e) => e.text()).then((jsonc) => {
$("#gamesList li").on("click", function() { $("#gamesList li").on("click", function() {
let url = $(this).attr("url"); let url = $(this).attr("url");
inGame = true;
$("#everything-else").fadeOut(); $("#everything-else").fadeOut();
$("#page-loader").fadeIn(); $("#page-loader").fadeIn();
$("#page-loader iframe")[0].src = url; $("#page-loader iframe")[0].src = url;