Skip to content

Commit 118d8b2

Browse files
authored
Merge pull request #1 from ABCoder1/bug/close-overlay-bug
Bugfix for unclosed overlay when another was just opened in quick succession.
2 parents 5f42db8 + 1bb9a43 commit 118d8b2

File tree

10 files changed

+1320
-98
lines changed

10 files changed

+1320
-98
lines changed

public/assets/SERC-neon-logo.png

1.38 MB
Loading
49.9 KB
Binary file not shown.
50.1 KB
Binary file not shown.
1.96 MB
Loading

public/assets/pacman-layered-map.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
1010
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
1111
0, 0, 471, 362, 473, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
12-
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
12+
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
1313
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 318, 318, 318, 318, 318, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
1414
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 473, 473, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1515
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 473, 473, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1616
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 473, 473, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1717
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 473, 473, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1818
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 318, 318, 318, 318, 318, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
19-
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
19+
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
2020
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
2121
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
2222
0, 0, 471, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, 0, 0, 0, 0, 471, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 0, 0,
@@ -39,16 +39,16 @@
3939
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612774, 1610612805, 469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 121,
4040
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612774, 1610612805, 469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, 152,
4141
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612774, 1610612805, 469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 121,
42-
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612772, 1610612803, 1610613299, 1610613330, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, 152,
42+
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612772, 1610612803, 1610613299, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, 152,
4343
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1610612771, 1610612802, 1610613298, 1610613329, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 121,
4444
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, 152,
4545
562, 563, 564, 565, 566, 564, 565, 566, 564, 565, 566, 564, 565, 566, 564, 565, 566, 2684354626, 2684354595, 0, 0, 2684355153, 2684355122, 584, 583, 584, 583, 584, 583, 584, 583, 584, 583, 584, 583, 584, 583, 584, 585, 586,
4646
593, 594, 595, 596, 597, 595, 596, 597, 595, 596, 597, 595, 596, 597, 595, 596, 597, 2684354627, 2684354596, 0, 0, 2684355154, 2684355123, 615, 614, 615, 614, 615, 614, 615, 614, 615, 614, 615, 614, 615, 614, 615, 616, 617,
4747
35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 38, 39, 38, 39, 38, 39, 1610613299, 1610613330, 0, 0, 1610612772, 1610612803, 57, 56, 57, 56, 57, 56, 57, 56, 57, 56, 57, 56, 57, 56, 57, 58, 59,
4848
66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 69, 70, 69, 70, 69, 70, 1610613298, 1610613329, 0, 0, 1610612771, 1610612802, 88, 87, 88, 87, 88, 87, 88, 87, 88, 87, 88, 87, 88, 87, 88, 89, 90,
4949
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 492, 493,
50-
252, 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684355153, 2684355122, 2684354626, 2684354595, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 523, 524,
51-
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684355154, 2684355123, 2684354627, 2684354596, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 492, 493,
50+
252, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684355153, 2684355122, 2684354626, 2684354595, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 523, 524,
51+
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684355154, 2684355123, 2684354627, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 492, 493,
5252
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3221226004, 3221226003, 469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 523, 524,
5353
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3221226004, 3221226003, 469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 492, 493,
5454
469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3221226004, 3221226003, 469, 470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 523, 524,
@@ -74,7 +74,7 @@
7474
{
7575
"columns":31,
7676
"firstgid":1,
77-
"image":".\/pacman-background-992x672.png",
77+
"image":"..\/Downloads\/pacman-background-992x672.png",
7878
"imageheight":672,
7979
"imagewidth":992,
8080
"margin":0,
1.9 MB
Loading

public/assets/ucr-neon-logo.png

1.64 MB
Loading

public/index.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,20 @@ html, body {
1212

1313
canvas {
1414
display: block; /* Remove any inline spacing */
15+
}
16+
17+
/* Loading Pixelify Sans Bold font */
18+
@font-face {
19+
font-family: 'Pixelify Sans Bold';
20+
src: url('assets/fonts/PixelifySans-Bold.ttf') format('truetype');
21+
font-weight: bold;
22+
font-style: normal;
23+
}
24+
25+
/* Loading Pixelify Sans Regular font */
26+
@font-face {
27+
font-family: 'Pixelify Sans Regular';
28+
src: url('assets/fonts/PixelifySans-Regular.ttf') format('truetype');
29+
font-weight: normal;
30+
font-style: normal;
1531
}

public/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<script src="//cdn.jsdelivr.net/npm/phaser@3.11.0/dist/phaser.js"></script>
88
<!-- For Phaser's Physics System -->
99
<script src="https://cdn.jsdelivr.net/npm/phaser@3.60.0/dist/phaser-arcade-physics.min.js"></script>
10+
<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
1011
</head>
1112
<body>
1213

0 commit comments

Comments
 (0)