Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # frontend/model/Obstacle.ts
2023-01-10 09:41:03 +01:00 · 2023-01-10 09:41:03 +01:00 · 171844013c
commit 171844013c
parent 8d4e0ec3f1 fbe6318cdd
8 changed files with 116 additions and 44 deletions
--- a/frontend/game.ts
+++ b/frontend/game.ts
@ -19,6 +19,7 @@ function setup() {
    createCanvas(2000, 1000);
    obstacleOffset = width / 3;
    Obstacle.distanceBetweenPipes = height / 2.5
+    Obstacle.startX = width;

    textSize(150);
    textFont("resources/PressStart2P-Regular.ttf");