From 9d871574242d2019c6b61827bfee7ef043235a89 Mon Sep 17 00:00:00 2001 From: TEST Date: Tue, 15 Apr 2025 09:03:04 +0200 Subject: [PATCH 1/5] change file location --- resources/pieces.png | Bin 954 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/pieces.png diff --git a/resources/pieces.png b/resources/pieces.png deleted file mode 100644 index 01cc2f8e0723c40907fcafb30d2044adb1dbd2ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 954 zcmV;r14aCaP)Px&bV)=(RA_n93+CyBv1*&Oq{|ll?3Z58QD>Akp8lm*j5papY>-F z_|!G7(E+F0t>l*zXgEm&ZX>9f!1N&qw-hUoZ8N-SbSxaZQZ4>gfJ_4KfM-5!RAwmJ zMI2yF^HZ4sCXebFxEx$X2W8v9$LS)4Z@xqo@XOd44k-syX8#}){C6-GEbrN>nHrbpkZqDvUnK2wjy?t@5Rq@NFzyDK7;PhNe%$nS?gU#z?WPf0 z=Bh{9D_%50EY8Tmu^pC9C;6oj)D`T4XjaOO$^;XQ5ZQ&5aq|iC@qZ7s^`d)qG970lGuj~I+H*dh?h7i*(5ku$?%p{z4<&P9=274 zgXq}=KDD{39dO#*N`5DSnpAR7{v54Ix!65KGqwpIS0_1l@pkYLe#J+}w~8l>Q`XTg{0sZ)wNvYW cJN8}q0;pW6z5*s-O#lD@07*qoM6N<$g2Ji5hX4Qo From ec05d58daa77b7c90fd6ccb15dbc59e3bb6ac4d9 Mon Sep 17 00:00:00 2001 From: "lucie.gauthier" Date: Tue, 15 Apr 2025 09:05:59 +0200 Subject: [PATCH 2/5] pieces --- resources/pieces.png => pieces.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/pieces.png => pieces.png (100%) diff --git a/resources/pieces.png b/pieces.png similarity index 100% rename from resources/pieces.png rename to pieces.png From 15b3250c7e271cd0f03038f2b8379b09520c29b1 Mon Sep 17 00:00:00 2001 From: TEST Date: Tue, 15 Apr 2025 09:23:46 +0200 Subject: [PATCH 3/5] width and height Merge branch 'master' of https://gitarero.ecam.fr/lucie.gauthier/OOP_3B2_Project --- src/backend/Board.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backend/Board.java b/src/backend/Board.java index 4623d10..729f61c 100644 --- a/src/backend/Board.java +++ b/src/backend/Board.java @@ -3,19 +3,20 @@ package backend; import java.util.ArrayList; public class Board { + + private int width; + private int height; public Board(int colNum, int lineNum) { //TODO } public int getWidth() { - //TODO - return 0; + return this.width; } public int getHeight() { - //TODO - return 0; + return this.height; } public int getTurnNumber() { From 45cf50f6ffadf5540738ac02cd69f7701ffd2b7f Mon Sep 17 00:00:00 2001 From: "lucie.gauthier" Date: Tue, 15 Apr 2025 09:25:21 +0200 Subject: [PATCH 4/5] getX and Y --- src/backend/Piece.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/backend/Piece.java b/src/backend/Piece.java index ffa88bb..8ee88d4 100644 --- a/src/backend/Piece.java +++ b/src/backend/Piece.java @@ -2,12 +2,15 @@ package backend; public class Piece { + private int x; + private int y; + public int getX() { - return 0; + return this.x; } public int getY() { - return 0; + return this.y; } public PieceType getType() { From 6cf6c4f95e518d3459658bc70a3a31a8d8b2a16b Mon Sep 17 00:00:00 2001 From: TEST Date: Tue, 15 Apr 2025 09:42:38 +0200 Subject: [PATCH 5/5] e --- src/backend/Board.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backend/Board.java b/src/backend/Board.java index 729f61c..4159983 100644 --- a/src/backend/Board.java +++ b/src/backend/Board.java @@ -4,19 +4,20 @@ import java.util.ArrayList; public class Board { - private int width; - private int height; + public Board(int colNum, int lineNum) { //TODO } public int getWidth() { - return this.width; + return 0; + } public int getHeight() { - return this.height; + return 0; + } public int getTurnNumber() {