From 3753299b0c98848823218aea85c6ad6f2fa94450 Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Mon, 8 Feb 2021 16:37:43 -0500 Subject: [PATCH 1/8] changed square size --- .../src/edu/ycp/cs320/movethesquare/ui/GameView.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java index 674d86b..1f09914 100644 --- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java +++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java @@ -84,8 +84,9 @@ public void run() { Square square = new Square(); square.setX(300.0); square.setY(220.0); - square.setWidth(40.0); - square.setHeight(40.0); + //ksmith126 changed the block size + square.setWidth(80.0); + square.setHeight(80.0); model.setSquare(square); GameController controller = new GameController(); From 415c13be7007cab6cdeda93fb2390392c482d908 Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Mon, 8 Feb 2021 17:13:20 -0500 Subject: [PATCH 2/8] changed size again --- MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java index 1f09914..6ac10c1 100644 --- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java +++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java @@ -85,7 +85,7 @@ public void run() { square.setX(300.0); square.setY(220.0); //ksmith126 changed the block size - square.setWidth(80.0); + square.setWidth(70.0); square.setHeight(80.0); model.setSquare(square); From 9a56694642cc110f7ddc2d58c8e3960f27d15f38 Mon Sep 17 00:00:00 2001 From: DonaldHakeII Date: Sun, 5 Mar 2017 18:52:57 -0500 Subject: [PATCH 3/8] Changed square size, color and speed. --- .../src/edu/ycp/cs320/movethesquare/ui/GameView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java index 4f8a7a7..674d86b 100644 --- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java +++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java @@ -28,8 +28,9 @@ public GameView(Game model) { setPreferredSize(new Dimension((int) model.getWidth(), (int)model.getHeight())); setBackground(MIDNIGHT_BLUE); - // djh2-KEC119-21: cahnged from 30 to 45 - this.timer = new Timer(1000 / 45, new ActionListener() { + // djh2-KEC119-21: changed from 30 to 45 + // djh2-YCPlaptop: change from 45 to 100 + this.timer = new Timer(1000 / 100, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -64,7 +65,8 @@ protected void paintComponent(Graphics g) { super.paintComponent(g); // paint background // djh2-KEC110-21: changed from GREEN to RED - g.setColor(Color.RED); + // djh2-YCPlaptop: change from RED to YELLOW + g.setColor(Color.YELLOW); Square square = model.getSquare(); From 9cea39d14632b753a5d88ab5de647093bf23d97d Mon Sep 17 00:00:00 2001 From: Derek Herr Date: Wed, 10 Feb 2021 18:43:06 -0500 Subject: [PATCH 4/8] Added & applied new background color --- .../src/edu/ycp/cs320/movethesquare/ui/GameView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java index 674d86b..7a2d017 100644 --- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java +++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java @@ -18,6 +18,8 @@ public class GameView extends JPanel { private static final Color MIDNIGHT_BLUE = new Color(25, 25, 112); + //dherr: new background color Sunset_Red + private static final Color Sunset_Red = new Color(220, 49, 11); private Game model; private GameController controller; @@ -26,7 +28,8 @@ public class GameView extends JPanel { public GameView(Game model) { this.model = model; setPreferredSize(new Dimension((int) model.getWidth(), (int)model.getHeight())); - setBackground(MIDNIGHT_BLUE); + //dherr: applied new background color + setBackground( Sunset_Red); // djh2-KEC119-21: changed from 30 to 45 // djh2-YCPlaptop: change from 45 to 100 From cc6b13e839f366dd9e03c06fad12b79f1345edd3 Mon Sep 17 00:00:00 2001 From: Johnny Quinteros Date: Wed, 10 Feb 2021 19:37:36 -0500 Subject: [PATCH 5/8] Update GameView.java I changed background color --- .../src/edu/ycp/cs320/movethesquare/ui/GameView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java index 674d86b..b748fb3 100644 --- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java +++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java @@ -17,7 +17,7 @@ import edu.ycp.cs320.movethesquare.model.Square; public class GameView extends JPanel { - private static final Color MIDNIGHT_BLUE = new Color(25, 25, 112); + private static final Color RED = new Color(100, 0, 0); private Game model; private GameController controller; @@ -26,7 +26,7 @@ public class GameView extends JPanel { public GameView(Game model) { this.model = model; setPreferredSize(new Dimension((int) model.getWidth(), (int)model.getHeight())); - setBackground(MIDNIGHT_BLUE); + setBackground(RED); // djh2-KEC119-21: changed from 30 to 45 // djh2-YCPlaptop: change from 45 to 100 From 239fc7070f223c3f8cabd4540b2c13b24fed4c90 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 17 Feb 2021 00:59:41 +0000 Subject: [PATCH 6/8] circles are better --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac8163e..ef05eff 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MoveTheSquare +MoveTheCircle ============= The game engine for the next great indie game. From 5dd7405bd082481167cf1b4daf67a7cd428117a4 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 17 Feb 2021 01:00:18 +0000 Subject: [PATCH 7/8] l33tsp3ak --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac8163e..89c40b3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MoveTheSquare +MoveThaSquare ============= The game engine for the next great indie game. From d0b6f7922844aab01ae4fcf82babbd9d628fd48a Mon Sep 17 00:00:00 2001 From: Kai Barclay Date: Tue, 16 Feb 2021 20:05:49 -0500 Subject: [PATCH 8/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4eee674..c561c9a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -MoveThaSquare +MoveTheSquare The game engine for the next great indie game.