sans les erreurs de git dans le code
This commit is contained in:
parent
870bc240b3
commit
172a4e6604
2 changed files with 1 additions and 11 deletions
|
@ -7,7 +7,7 @@
|
||||||
<meta name="description" content="">
|
<meta name="description" content="">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<link rel="icon" href="./res/player.png"/>
|
<link rel="icon" href="./res/mario.png"/>
|
||||||
<!-- Place favicon.ico in the root directory -->
|
<!-- Place favicon.ico in the root directory -->
|
||||||
<link rel="stylesheet" href="./style.css"/>
|
<link rel="stylesheet" href="./style.css"/>
|
||||||
|
|
||||||
|
@ -21,16 +21,10 @@
|
||||||
your experience.
|
your experience.
|
||||||
</p>
|
</p>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
<<<<<<< HEAD
|
|
||||||
<nav>
|
<nav>
|
||||||
<ol id="level-lists">
|
<ol id="level-lists">
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
=======
|
|
||||||
<div id="timer">Time</div>
|
|
||||||
<button id="Pause" onclick="Pause()">Pause</button>
|
|
||||||
<canvas id="canvas" width="800" height="400"></canvas>
|
|
||||||
>>>>>>> 380cebd36dc4e3a1f3af185d1a7e3f0adb3e04d1
|
|
||||||
<div class="to-center">
|
<div class="to-center">
|
||||||
<canvas id="canvas" width="800" height="400"></canvas>
|
<canvas id="canvas" width="800" height="400"></canvas>
|
||||||
<div class="text-bubble">
|
<div class="text-bubble">
|
||||||
|
|
|
@ -7,11 +7,7 @@ fillLevelSelection();
|
||||||
let canvas = document.getElementById('canvas');
|
let canvas = document.getElementById('canvas');
|
||||||
let ctx = canvas.getContext('2d');
|
let ctx = canvas.getContext('2d');
|
||||||
window.ctx = ctx
|
window.ctx = ctx
|
||||||
<<<<<<< HEAD
|
|
||||||
let playground = generatePlayground(levelsBlueprint[0], canvas.width, canvas.height);
|
let playground = generatePlayground(levelsBlueprint[0], canvas.width, canvas.height);
|
||||||
=======
|
|
||||||
let playground = generatePlayground(level2Blueprint, canvas.width, canvas.height);
|
|
||||||
>>>>>>> 380cebd36dc4e3a1f3af185d1a7e3f0adb3e04d1
|
|
||||||
window.addEventListener("keydown", (event) => {
|
window.addEventListener("keydown", (event) => {
|
||||||
if (!event.defaultPrevented) {
|
if (!event.defaultPrevented) {
|
||||||
switch (event.key) {
|
switch (event.key) {
|
||||||
|
|
Loading…
Reference in a new issue