Merge branch 'main' of https://github.com/Gabriel-Gravin/Teamwork

Gabriel-Gravin · Oct 23, 2023 · 356359d · 356359d
2 parents be3bff9 + bae8976
commit 356359d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/_posts/2023-10-11-MainGameFile.md b/_posts/2023-10-11-MainGameFile.md
@@ -20,7 +20,7 @@ Freeplay with Link! Use "D" to make him move right, use the "A" to make him move
     <canvas id="gameCanvas" width="800" height="400"></canvas>
     <script type="module">
         import { Character } from '{{site.baseurl}}/assets/js/Character.js'
-        var Link = new Character('{{site.baseurl}}/images/linksprites.png', 96, 104, 100, 800 - 400, -10, .5, 2);
+        var Link = new Character('{{site.baseurl}}/images/linksprites.png', 96, 104, 100, 400 - 104, -10, .5, 2);
         // Get the canvas and its 2D rendering context
         const canvas = document.getElementById('gameCanvas');
         const ctx = canvas.getContext('2d');

diff --git a/_posts/2023-10-12-gameframework_2.md b/_posts/2023-10-12-gameframework_2.md
@@ -211,7 +211,11 @@ backgroundImg.onload = function () {
     toggleCanvasEffect.addEventListener("click", function () {
         if (isFilterEnabled) {
             canvas.style.filter = "invert(100%)";  // remove filter
+<<<<<<< HEAD
+            linkCanvas.style.filter = "invert(100%)";
+=======
             goblinCanvas.style.filter = "invert(100%)";
+>>>>>>> f70e2562aa112f946c7cf37a843b8e41d50d92a2
         } else {
             canvas.style.filter = defaultFilter; // Apply the default filter value
             linkCanvas.style.filter = defaultFilter;