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

# Conflicts:
#	frontend/model/Obstacle.ts
This commit is contained in:
dhain 2023-01-10 09:38:38 +01:00
commit 8d4e0ec3f1
2 changed files with 56 additions and 25 deletions

View file

@ -1,11 +1,15 @@
class Obstacle extends Entity implements Collidable {
private pipeTop: Pipe;
private pipeBottom: Pipe;
private static _distanceBetweenPipes: number;
private readonly padding: number = 150;
private readonly speed: number = 3;
public static distanceBetweenPipes: number;
public static startX: number;
private static startX: number;
static set distanceBetweenPipes(value: number) {
this._distanceBetweenPipes = value;
}
/**
* Constructs the Obstacle with the given image