From b966d45a7e2555de0756b21d7fd841ea54f13cc2 Mon Sep 17 00:00:00 2001
From: tredfern1 <tredfern@ycp.edu>
Date: Sun, 7 Feb 2021 17:20:41 -0500
Subject: [PATCH 01/25] Changed background to back, changed square color to
 green, changed square to a rectangle

---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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..446213d 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 BLACK = new Color(0, 0, 0);
 	
 	private Game model;
 	private GameController controller;
@@ -26,11 +26,11 @@ 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(BLACK);
 
 		// djh2-KEC119-21: changed from 30 to 45
 		// djh2-YCPlaptop: change from 45 to 100
-		this.timer = new Timer(1000 / 100, new ActionListener() {
+		this.timer = new Timer(1000 / 150, new ActionListener() {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.GREEN);
 
 		Square square = model.getSquare();
 		
@@ -84,8 +84,8 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
-				square.setHeight(40.0);
+				square.setWidth(60.0);
+				square.setHeight(20);
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From ac76e6dc1bdb21362f6f0e7cf87c5799633452c8 Mon Sep 17 00:00:00 2001
From: tredfern1 <tredfern@ycp.edu>
Date: Sun, 7 Feb 2021 17:23:33 -0500
Subject: [PATCH 02/25] Revert "Changed background to back, changed square
 color to green, changed square to a rectangle"

This reverts commit b966d45a7e2555de0756b21d7fd841ea54f13cc2.
---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
index 446213d..674d86b 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 BLACK = new Color(0, 0, 0);
+	private static final Color MIDNIGHT_BLUE = new Color(25, 25, 112);
 	
 	private Game model;
 	private GameController controller;
@@ -26,11 +26,11 @@ public class GameView extends JPanel {
 	public GameView(Game model) {
 		this.model = model;
 		setPreferredSize(new Dimension((int) model.getWidth(), (int)model.getHeight()));
-		setBackground(BLACK);
+		setBackground(MIDNIGHT_BLUE);
 
 		// djh2-KEC119-21: changed from 30 to 45
 		// djh2-YCPlaptop: change from 45 to 100
-		this.timer = new Timer(1000 / 150, new ActionListener() {
+		this.timer = new Timer(1000 / 100, new ActionListener() {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.GREEN);
+		g.setColor(Color.YELLOW);
 
 		Square square = model.getSquare();
 		
@@ -84,8 +84,8 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(60.0);
-				square.setHeight(20);
+				square.setWidth(40.0);
+				square.setHeight(40.0);
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From f00259c746e09bcb39723d3bd0c3c14b8e5a0182 Mon Sep 17 00:00:00 2001
From: tredfern1 <tredfern@ycp.edu>
Date: Sun, 7 Feb 2021 17:25:22 -0500
Subject: [PATCH 03/25] changed square from yellow to green, changed square to
 a rectangle

---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java        | 6 +++---
 1 file changed, 3 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 674d86b..1ff878c 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.GREEN);
 
 		Square square = model.getSquare();
 		
@@ -84,8 +84,8 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
-				square.setHeight(40.0);
+				square.setWidth(60.0);
+				square.setHeight(25);
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From aa15d780a6098e0687ccb24066fd5bae493d9813 Mon Sep 17 00:00:00 2001
From: Tyler <tfranks@ycp.edu>
Date: Mon, 8 Feb 2021 11:27:23 -0500
Subject: [PATCH 04/25] Changed the rectangle from solid to hollow

---
 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 674d86b..9ebaca2 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -70,7 +70,7 @@ protected void paintComponent(Graphics g) {
 
 		Square square = model.getSquare();
 		
-		g.fillRect((int) square.getX(), (int) square.getY(), (int) square.getWidth(), (int) square.getHeight());
+		g.drawRect((int) square.getX(), (int) square.getY(), (int) square.getWidth(), (int) square.getHeight());
 	}
 	
 	public static void main(String[] args) {

From 3753299b0c98848823218aea85c6ad6f2fa94450 Mon Sep 17 00:00:00 2001
From: Kyle Smith <ksmith126@ycp.edu>
Date: Mon, 8 Feb 2021 16:37:43 -0500
Subject: [PATCH 05/25] 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 <ksmith126@ycp.edu>
Date: Mon, 8 Feb 2021 17:13:20 -0500
Subject: [PATCH 06/25] 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 560f82b4d31f414d9c5cbdc85c82c7a09b96116f Mon Sep 17 00:00:00 2001
From: Kevin Tanzosh <ktanzosh@ycp.edu>
Date: Mon, 8 Feb 2021 19:35:56 -0500
Subject: [PATCH 07/25] Update GameView.java

Changed the color from yellow to red, made it a circle, and made the radius 50.
---
 .../edu/ycp/cs320/movethesquare/ui/GameView.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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..0974400 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.RED);
 
 		Square square = model.getSquare();
 		
@@ -81,12 +81,11 @@ public void run() {
 				model.setWidth(640.0);
 				model.setHeight(480.0);
 				
-				Square square = new Square();
-				square.setX(300.0);
-				square.setY(220.0);
-				square.setWidth(40.0);
-				square.setHeight(40.0);
-				model.setSquare(square);
+				Cirlce c = new Circle();
+				c.setX(300.0);
+				c.setY(220.0);
+				c.setRadius(50.0);
+				model.setSquare(c);
 				
 				GameController controller = new GameController();
 				

From dab20455223e48a15f130c8892075707af1cad84 Mon Sep 17 00:00:00 2001
From: Kayla Hunt <78668827+huntress284@users.noreply.github.com>
Date: Tue, 9 Feb 2021 16:44:27 -0500
Subject: [PATCH 08/25] Update GameView.java

changed color
---
 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 674d86b..bf31daf 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.RED);
 
 		Square square = model.getSquare();
 		

From 9a56694642cc110f7ddc2d58c8e3960f27d15f38 Mon Sep 17 00:00:00 2001
From: DonaldHakeII <djhake2@ycp.edu>
Date: Sun, 5 Mar 2017 18:52:57 -0500
Subject: [PATCH 09/25] 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 f15d4a40fdcaeafd92a378ccc883382846beadf5 Mon Sep 17 00:00:00 2001
From: Kayla Hunt <78668827+huntress284@users.noreply.github.com>
Date: Tue, 9 Feb 2021 20:43:30 -0500
Subject: [PATCH 10/25] Update GameView.java

made square into rectangle
---
 MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java | 3 ++-
 1 file changed, 2 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 bf31daf..6f0de01 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,6 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
+		//khunt6 changed from YELLOW to RED
 		g.setColor(Color.RED);
 
 		Square square = model.getSquare();
@@ -84,7 +85,7 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
+				square.setWidth(60.0);
 				square.setHeight(40.0);
 				model.setSquare(square);
 				

From 76fa4a2a99b94712ee96af7ddf926023f58426c7 Mon Sep 17 00:00:00 2001
From: Liam <lbradley1@ycp.edu>
Date: Wed, 10 Feb 2021 11:27:54 -0500
Subject: [PATCH 11/25] Square Modifications

I made the square 3x faster as well as the color blue, and a little bit smaller to give it extra speedy looking movement.
---
 .classpath                                      |  6 ++++++
 .gitignore                                      |  1 +
 .project                                        | 17 +++++++++++++++++
 .../edu/ycp/cs320/movethesquare/model/Game.java |  3 ++-
 .../ycp/cs320/movethesquare/ui/GameView.java    | 10 ++++++----
 5 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 .classpath
 create mode 100644 .gitignore
 create mode 100644 .project

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..8fd17d8
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="MoveTheSquare/src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/.project b/.project
new file mode 100644
index 0000000..78f6692
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MoveTheSquare</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/model/Game.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/model/Game.java
index d0e3f25..6451b76 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/model/Game.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/model/Game.java
@@ -1,7 +1,8 @@
 package edu.ycp.cs320.movethesquare.model;
 
 public class Game {
-	public static final double MOVE_DIST = 2.0; // x/y distance square moves each tick 
+	// lbradley1: speed up the squares movement by double
+	public static final double MOVE_DIST = 6.0; // x/y distance square moves each tick 
 	private double width, height;
 	private Square square;
 	private double squareDx;
diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
index 674d86b..51c782d 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,8 +66,9 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
-
+		// lbradley1: change from YELLOW to BLUE
+		g.setColor(Color.BLUE);
+		
 		Square square = model.getSquare();
 		
 		g.fillRect((int) square.getX(), (int) square.getY(), (int) square.getWidth(), (int) square.getHeight());
@@ -84,8 +85,9 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
-				square.setHeight(40.0);
+				// lbradley1: change the size of the square to be smaller
+				square.setWidth(25.0);
+				square.setHeight(25.0);
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From 9cea39d14632b753a5d88ab5de647093bf23d97d Mon Sep 17 00:00:00 2001
From: Derek Herr <dherr@ycp.edu>
Date: Wed, 10 Feb 2021 18:43:06 -0500
Subject: [PATCH 12/25] 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 cd4cc960dafff8a9de67c5b575ae6c46aea334ed Mon Sep 17 00:00:00 2001
From: Saul S <ssanjuan1@ycp.edu>
Date: Wed, 10 Feb 2021 19:06:46 -0500
Subject: [PATCH 13/25] changed color and size

---
 .../ycp/cs320/movethesquare/controllers/GameController.java | 2 +-
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java
index 9c20be9..6c9fbf2 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java
@@ -21,7 +21,7 @@ public void computeSquareMoveDirection(Game game, Square square, double mouseX,
 				moveY = -Game.MOVE_DIST;
 			}
 			
-			game.setSquareDx(moveX);
+			game.setSquareDx(moveX); 
 			game.setSquareDy(moveY);
 		}
 	}
diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
index 674d86b..2aaaeab 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.RED);
 
 		Square square = model.getSquare();
 		
@@ -84,8 +84,8 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
-				square.setHeight(40.0);
+				square.setWidth(30.0);
+				square.setHeight(30.0);
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From cc6b13e839f366dd9e03c06fad12b79f1345edd3 Mon Sep 17 00:00:00 2001
From: Johnny Quinteros <jquinteros@ycp.edu>
Date: Wed, 10 Feb 2021 19:37:36 -0500
Subject: [PATCH 14/25] 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 e4fc969fb9f7e71950c5f8a429ff7eb8f07d37b8 Mon Sep 17 00:00:00 2001
From: Ryan <60356334+rblack5@users.noreply.github.com>
Date: Thu, 11 Feb 2021 12:45:23 -0500
Subject: [PATCH 15/25] Update GameView.java

- Increase square size
- Change color from YELLOW to RED
---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java        | 6 +++---
 1 file changed, 3 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 674d86b..ca1febe 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.RED);
 
 		Square square = model.getSquare();
 		
@@ -84,8 +84,8 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
-				square.setHeight(40.0);
+				square.setWidth(100.0);
+				square.setHeight(100.0);
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From fb27557c8ea6ace8dd1f699d052b861126966b4c Mon Sep 17 00:00:00 2001
From: Ricky <rdean00@me.com>
Date: Thu, 11 Feb 2021 16:35:29 -0500
Subject: [PATCH 16/25] Added color Red, changed background to Red, changed
 cube to blue

---
 .classpath                                      |  6 ++++++
 .gitignore                                      |  1 +
 .project                                        | 17 +++++++++++++++++
 .../ycp/cs320/movethesquare/ui/GameView.java    |  8 ++++++--
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .classpath
 create mode 100644 .gitignore
 create mode 100644 .project

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..8fd17d8
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="MoveTheSquare/src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/.project b/.project
new file mode 100644
index 0000000..78f6692
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MoveTheSquare</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
index 674d86b..5421b6e 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);
+	// added color RED
+	private static final Color RED = new Color(255, 0, 0);
 	
 	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);
+		// changed background to RED
+		setBackground(RED);
 
 		// djh2-KEC119-21: changed from 30 to 45
 		// djh2-YCPlaptop: change from 45 to 100
@@ -66,7 +69,8 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		// changed from YELLOW to BLUE
+		g.setColor(Color.BLUE);
 
 		Square square = model.getSquare();
 		

From 040c19dfb87e2a89f4a401a5b9379f846e03db72 Mon Sep 17 00:00:00 2001
From: Ethan Snyder <esnyder16@ycp.edu>
Date: Thu, 11 Feb 2021 16:36:52 -0500
Subject: [PATCH 17/25] Changed Background and Square Color

Changed the background to gray and the square to blue
---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java        | 6 +++---
 1 file changed, 3 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 674d86b..d456eab 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 GRAY = new Color(105, 110, 115);
 	
 	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(GRAY);
 
 		// djh2-KEC119-21: changed from 30 to 45
 		// djh2-YCPlaptop: change from 45 to 100
@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 		
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.BLUE);
 
 		Square square = model.getSquare();
 		

From 935053a26cb8f65149ebd0fdd16293e4c3230f75 Mon Sep 17 00:00:00 2001
From: michaelfeldman1 <78584019+michaelfeldman1@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:19:09 -0500
Subject: [PATCH 18/25] Update GameView.java

Changed the height from 40.0 to 80.0 changed the width from 40.0 to 80.0 and changed the color of MIDNIGHT_BLUE to MIDNIGHT_PURPLE.
---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java   | 10 +++++++++-
 1 file changed, 9 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..8193cbb 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -26,8 +26,12 @@ public class GameView extends JPanel {
 	public GameView(Game model) {
 		this.model = model;
 		setPreferredSize(new Dimension((int) model.getWidth(), (int)model.getHeight()));
-		setBackground(MIDNIGHT_BLUE);
+		
+		
+		// MF changed this color from MIDNIGHT_BLUE to MIDNIGHT_PURPLE
+		setBackground(MIDNIGHT_PURPLE);
 
+		
 		// djh2-KEC119-21: changed from 30 to 45
 		// djh2-YCPlaptop: change from 45 to 100
 		this.timer = new Timer(1000 / 100, new ActionListener() {
@@ -84,7 +88,11 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
+				
+				// MF changed square width from 40.0 to 80.0
 				square.setWidth(40.0);
+				
+				// MF changed square height from 40.0 to 80.0
 				square.setHeight(40.0);
 				model.setSquare(square);
 				

From 126fa7dc2595932a11948ee35315da8c91f46e7a Mon Sep 17 00:00:00 2001
From: michaelfeldman1 <78584019+michaelfeldman1@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:29:57 -0500
Subject: [PATCH 19/25] Changed square height and background color

Changed square height from 40 to 80, changed square width from 40 to 80. Also changed the background color from MIDNIGHT_BLUE to MIDNIGHT_PURPLE.
---
 .../src/edu/ycp/cs320/movethesquare/ui/GameView.java        | 6 ++++--
 1 file changed, 4 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 8193cbb..6d82d76 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -90,10 +90,12 @@ public void run() {
 				square.setY(220.0);
 				
 				// MF changed square width from 40.0 to 80.0
-				square.setWidth(40.0);
+				square.setWidth(80.0);
 				
 				// MF changed square height from 40.0 to 80.0
-				square.setHeight(40.0);
+				square.setHeight(80.0);
+				
+				
 				model.setSquare(square);
 				
 				GameController controller = new GameController();

From d31a85a9ae686677943f6d4bf840f2c5a6499cf0 Mon Sep 17 00:00:00 2001
From: Ian Arnold <iarnold1@ycp.edu>
Date: Thu, 11 Feb 2021 22:46:08 -0500
Subject: [PATCH 20/25] made wider

---
 .../controllers/GameController.class             | Bin 0 -> 1561 bytes
 bin/edu/ycp/cs320/movethesquare/model/Game.class | Bin 0 -> 1468 bytes
 .../ycp/cs320/movethesquare/model/Square.class   | Bin 0 -> 1051 bytes
 .../ycp/cs320/movethesquare/ui/GameView$1.class  | Bin 0 -> 842 bytes
 .../ycp/cs320/movethesquare/ui/GameView$2.class  | Bin 0 -> 1859 bytes
 .../ycp/cs320/movethesquare/ui/GameView.class    | Bin 0 -> 2991 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bin/edu/ycp/cs320/movethesquare/controllers/GameController.class
 create mode 100644 bin/edu/ycp/cs320/movethesquare/model/Game.class
 create mode 100644 bin/edu/ycp/cs320/movethesquare/model/Square.class
 create mode 100644 bin/edu/ycp/cs320/movethesquare/ui/GameView$1.class
 create mode 100644 bin/edu/ycp/cs320/movethesquare/ui/GameView$2.class
 create mode 100644 bin/edu/ycp/cs320/movethesquare/ui/GameView.class

diff --git a/bin/edu/ycp/cs320/movethesquare/controllers/GameController.class b/bin/edu/ycp/cs320/movethesquare/controllers/GameController.class
new file mode 100644
index 0000000000000000000000000000000000000000..21d176ff49c00064c673848e877ab24425d4f26c
GIT binary patch
literal 1561
zcmbVMSx*yD7(KV`bh=C{t5oU&t}P%%aG|2OP{9S41Vu<RahTq~VB3Lqiee&v0~3v}
zKKoJ=AB@lbDD~XwfXf3m-e&Iow)@@lZT<HB^A`Yl+|dybI4_I!+@`gbvub0bBe}A(
zA>9>OTd$i{nX{aVTXjk$S*_(}%(9%?<#mJv+E&dCGgmSz%enhYtI~1>!k6rd?M?~=
zGue58(3De@F$57cpdl=<Z`Q8Jd-d{?tUffCN>ZR>*0Ideyjiss?+Zijid_>JpZz~{
z69T=KQ(mjPa?Xq7F2gF=RYJ6#iooN{o{q}|UGf5+Xu+=e!bG8vosXd%ojN)MPVNQ#
zmwy9Y=oW}9OZTx|bXUB*6_lGE11Y77Qgu_>%PVdSy*Q{NEs*)Q^Cl<*hm?;HeJrT!
zo#Cr2y;_PpYT($8dQk~_!e5n+OCiV@$YMYsUXyOqUEw8tW&AjY44nQ;y{VpJn-F0O
zc~cF=LWOHyg#-p#xZ~%Vx5`evCKm)mVTV~12o#AhP$UjbH8R!SNljwTHLd4&%{9Nl
zVoKliCh(|bxUEBMHp68DlPbk=R$wQGD$`dDTvN#lF}JKtJEja2{xaNDhSLUSb_^K?
z!(nR*#O9oO)soY;nxM`<M{`(BCHlc$@@g3*#o6Polh5%KJhg#Oh<qdwV6ow;)gC8p
zG!1wr$O$B|k2^053lY-5RyMi)7O%2{4Ya*^hxL@E_|=p~!F~#!WrrF#!0&JujyTqG
zUQcP{`uQFACDCL)p3EmwdUE?c;uPlN9}wxniF`a2-IXPLSz<61Z{XBmD$&58LLKx_
zPkLw~=tC4|D48PWTSWbUm>*HMfHpiu2a4!~%~30%8|$2_7dU{|NPE#f;ax`LN2{n|
zFG-3Tq1S+?9mSZJ&MllJrBObMbEI^>c@gJHMKO&F{EgA;En1C}O7L$M924yap+t2E
z9ql@LgWdu{$<Pm4YriRIF6eNgnQ)kVN>wpEq!P;PUa}gvqL_X%*U8-YRl}rbdYG>s
cVdwOD(e*X2??#u#O+UJ{ADtjt)djbI0u+^3Pyhe`

literal 0
HcmV?d00001

diff --git a/bin/edu/ycp/cs320/movethesquare/model/Game.class b/bin/edu/ycp/cs320/movethesquare/model/Game.class
new file mode 100644
index 0000000000000000000000000000000000000000..ae060aa187bbb5e6947c5523296af497a7c780db
GIT binary patch
literal 1468
zcma))ZEw<06vzLUhcciO+;p3wZa9TfHj3kw(GZj2!xD5aSn#DOa06X<P-y4)RBE!t
z#20=5Ka}yDw%L}ZL`b-&r#<I?e)oUxpTEC;19*;F0uh0N>^a7~``PHuY6n$gG&z&@
zK+e86=2TMFlSAXJIg$y)1hS{*nQ08oao;%ZoXV~(kbHmKe*LL&)H)Fm4T06e$#`a)
zW4mn*9jUycN&FLtf3<q{KtLHtt3RMl#hW3ZH~){&a(P||tax3G^XtbsX}z?@mR%Q!
zYNfV7?2x!qh~kclEN%;An$}o;a7G<DJuy2&DX`X@bj@MgoLZdwFJtz=nh9u20I?^8
zlblK0V-wh4rqAC<shuQG9;i^UN-F(pl|8Mr#P}P2Nc*GbY)or-vX51yppZc%>whC(
z=x~_!oohc&FRDm$8Bh1#3Z$?0(>UjvvWi<=lfEKk=WkTaxyn$H2~^Rcq*@ba+LdoC
z_B+XjRrvlOPaRRZ6AJDjPOCtIvIth_Pu%V^fw__FaU(&vk;YI=QxBaht!tFkC<=;k
z{U_FcxMg=~O_3b0G4gnWo>Z?0o7kdE(D3`TvOt|GxmMB3m&gSbG6b1*6*jyoUx7Ek
zcs%?e9{E~^n={M>a^Fcb0*2vT0_&k5+t~4&>*R~;j9$D%J_xc&AX^JS*f$2*#S>r4
zpvj&q7s!7LfaF3!o`!=If*{)jva<k$4~{{!P>@0pWH%I~6b_;XL5c*TEdb#g!ytR1
nAbJp_915}@4pIq%7z9#X0K!+6L8_r3l^{qh6y%wEfCv8o#kJLB

literal 0
HcmV?d00001

diff --git a/bin/edu/ycp/cs320/movethesquare/model/Square.class b/bin/edu/ycp/cs320/movethesquare/model/Square.class
new file mode 100644
index 0000000000000000000000000000000000000000..f761b8d92243d564095c35b0681a565e867fd4c7
GIT binary patch
literal 1051
zcma))%TC)s6o&svoV#1@&;sR76SAmLS)o>Jicl9(yP!&8={Td<C?qs-XnCp%353L=
z5739I_|G`qSQCkb=ghgxf4({6zyBWp060XofQ&*-w@2PhaODNVgZKO1W&c{op&tGi
z`2$U_t-Ic-aSCu0rZ4<!-|PClj`y{7p@UdK{o;4b??xf_Git}7LO#?{CuB1JG3rI}
zkwUh%*HmymQLv0GUb-lwqA=Bndiu-gvZV*#{8m>h%r^Rg-);JXNc?foiNk29P;WdJ
z_5*tjb$musJKk%Sps?s7hdcuv6DJU%rRZF;D=rHEv*!v$#=py5B)9IOD7hj}nxI07
z`OoH#Qn2l!Bn2fFBvFO(X@4{b^hqR_sw5+PC)2|wPh|N54l+W-T}FBv%Ra_Zj#jie
zCax~M16oC!t3Tkyttp%0TIO-E+#%#NcWzRI8O+jCn8Q3*5jbL7X`HWD@3D|ps1U|A
z3X5aKL_xF#Q<^W~)mY18O#*X=h2Ip-KwzW{+}S{0+d-DoAaiUtKLJGMBp|C+kmWSU
zk`?5Q9b_#HvO<v62_W)N0<vKRSxbYgTR}GMAX{mWZG!Af0FggMKz6JkTWOH06=c^u
G;M*t2IeN$d

literal 0
HcmV?d00001

diff --git a/bin/edu/ycp/cs320/movethesquare/ui/GameView$1.class b/bin/edu/ycp/cs320/movethesquare/ui/GameView$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..2f79d485f10d8aafe8c9dec0f6848ac4d1ac4005
GIT binary patch
literal 842
zcma)4+iuf95IviOI592>1xkRHa!Dac5pIDORD?iPxk#oUf%3kwhh~et3-&q{pM}Il
z;(-s~qY$$uh!<4F(yV7jb2)Qne*XIY1HgT3c&G^sDJjE`@%u0??%vr7GczMQrQ$;=
za|%lpK9w1b6&>}rJv0QmhjJ#vRO*B9<>ZiJ>!B&IR(a)-4QWQ&hL2;bjE+=cNmDM+
zv{O~|x42uhV7nbodZ4tj4+U-w7S0-u1sc01p*94T0(fZosG}30jjlj_-~u|4(zIV@
z6UyJnNlF6Ck%?tGmbr5F+}UuT1vVFL-rr`>9a)Y3it@K6&nOXCA4LCUXU{RUGaUQq
z;i88N0yh`rCcq^(OlK-}!e~{-bEx>8fZ$P9kLxDjzcyta(-Y;!Ui!P-+YTXD+|zMt
z3Z)NT@DZ5Av389aIG+EE=}xOV;b{bd=bCrEo64dfrmwY6g?(lUiz~d6I?D-&Zr5#w
zudv3_hR@!UtleYVdHm7l7X+hkIQ6NDIn8gAV}Pqz<~OKxA7^luErD}bnOAtke^;S3
z`i$T!&i~8zEB^-fy;0Rz`4cy<!5LV^8fQ0fne%H{XS`sm$33sJ<}f-0?(4JE(EAP2
C0m%sf

literal 0
HcmV?d00001

diff --git a/bin/edu/ycp/cs320/movethesquare/ui/GameView$2.class b/bin/edu/ycp/cs320/movethesquare/ui/GameView$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..70d5097cfc484b05402543b21c5c0b9816b3ca6e
GIT binary patch
literal 1859
zcma)6ZBH9V5PsI2Ut*5D5K7{z2_y=MjY%$rmIj;>2NPaW0|^j=lcw$2Uhsi^NAJ$i
zs8W?m{X_j?q*|)_xj(Avvu6`0RqJxn-tNxM%sxBw%>4P+Z@&YWK|P9)KuT5`#+&k?
zQTC=L?;CaJNcvUjecv!$X*4Wj$*jwQC68}SMxhB@+&7O*qh{KB#(HUAmi;Iq0)t)Y
zM#HwvQcVg(9$L2L&k6J;Qw0Gn=Tu}IedyN_MNHsA-m>Ldqh6BkR@-7Q@0872!E`OP
z?+7)&YIy?b{F#Afc%|F0qZkyp-OH*@M77|Baa=-wB>M{k!%yw5=(vi6K+Kc=wpH<~
zd_i&{RfuGN>MC8+aa}2$qtddp_NolWs6g`nFWn3R9LI>d*8L-Jsdi&JZYz%(J?=!Z
z2XEh<jO$3Bo)jb5N^n4^Be)XDE_8R-6#6M0pW*X1u=Z5~cauFs*bYWpIg=_x@rA&2
zuZNT!+jpH>O}btX!`!=l9MkBJVpiZzF9+|jD^5N>RJ{0-nLZ0nMN6Voc8_#q@mOGh
zA?sog$n^H}-|&Oi=Q^zZ!SIePvi<3z%PV7e!Wvj*k&LoRM%&T45yw216#8X>kCORr
zF>LxSZ3CS1c&g(o<OQx0=Yrfd8#O;yb3D0zC|%RH99uDLMZIYrYdY5Pj660g6@l@N
zPxII}a!&owv8C;2QtgXA6e{Bl9h<7av_rFepad^;6tFE2=gkGnvx4%}k}uowE9!Wu
z)X#gq>H3dttKLBq4k$r7pMf_)K3MZ!z-vN2gH4BP#MRA(z=NKaUCn=zj#aN6u~D(5
z_4M!_>u3_*RcRF%3WE7zvUwcebQ*41E?TOg4V?DEdn&_hU{CBa6UYp&vS&IK9TxV9
zqHbEu<#6)VzcE2TU$JfJ=4z(rNjA3Fn)Li-$MZ1?CY&S8Vh(YzOLBLPD}%G(93DSG
z{MX=E=RXn%S24h~-d4bQT;Pr*JvA0%bQ+=T=N2v%PjES(9>P!)!<;^D;*%CeD7~>d
zF@&2<+~Rbni4>=aChl=En)o!$^<)dvRD7`3!b~xJg3PRz(C#)d*TQ^paNz`tv*AQI
z(!@$4oY0zB-A;s?c%BGzy`=;@UEpiDOhC^F@j2mcU>I9$q%SZ=o=#vJQ`o^Qig<)q
zSi);+eM9MYD8WRP|3j3~Km|Wy7jLl_1YoZH$W8!acthK-8HnrDeNFoiJ<Z}<dg-IT
n`}9<T#xcV43S+K85>tpC_c&{8EL9wE6{imsd-c^gLYVm*jBd_K

literal 0
HcmV?d00001

diff --git a/bin/edu/ycp/cs320/movethesquare/ui/GameView.class b/bin/edu/ycp/cs320/movethesquare/ui/GameView.class
new file mode 100644
index 0000000000000000000000000000000000000000..96ff3a871efabb37e8a5c24a54c55a4722658643
GIT binary patch
literal 2991
zcmcIm`%@EF7(ELy3(Jc5!irk8S`7&ppCE!-1jN_`sl1HV+BI2WCE3N@4fyEWKIn_S
z+yA07+8R1#ra!hb{h!+DxpzYnI&H@OP%_+`z56}R{l0V0&F_Ey{0o2{e5ayL!9g=y
zh~LZ1#WUWqqle>pXWsN@Oz%#?aLstZiVqukbJ8*wRD=|4x^2uGcjMlIWlzU1jvBU^
zQ?Ndj7#v9qUl_k}E;%uzpd~4+;>Lm>A8>Mx+pAz*-pLBnNU~NoX(SWUMaww0?>f1h
z=_)u`)30LbN$-KOr%3Hvc@bi>M74^2TrBc!LtiFm*_MAsL4BlsQbA~dNL6f9(7bjR
z8d|Vf#};f=5bi7agd>SWqJ6Rv3byH3hp>VTNy|1z3i+F+J8s;}nJik;$r!mw!?nb7
zX)*THrD&hjP>-D=b+btHtPT|oD)yAxAqzdo{n(!6*czV0eii!^9C*4?>v$dqScqxU
zpR%(4j4Z^U2ourKE?zbA)dka<p7Ay8Moa+dU|qR&0ZqXn9dR6H-#ybGb<JC*>zdgy
z>pr)>EmGk^8DekXc2vhP94CF~cFxGmPP<OQ&azQeJ^_E)CslMQ*jP<I*+3O16|~pd
zXBC0>AJNc_QvyC4-%-2%Relog37i&=q{+TWqOvD*-n9LAf5vC!la}Y3Hdz($;RPK{
z&`BtN#`1`=CWEWf1r@1qSV3=XtTpH#Ksm3Y5gHlo`G)KF+g9EXfHj;zLdQikvzzi2
z**jy{S&~#7k8vwAD|nF7F@j4055}Y}i1O9mP;it3>s~>Umvmgl7)e4hrJRCijyj$t
zP>{upRX%H@j%EAwn81_@p2x~5ly7ug5tIxu$`xUBRmZi}g|vq2xS`?|1zoi`@$dE0
z@hS`jZ5by&SMbdMeu|1XXt}0rvVy7F&8X6_njK$Lpus_LB(5W)BMTlIO{nl{sVDx2
zguw}%)-fZRue#=(!Ln1>yi$LoPY<5jkrxf6%B|7<pp#_tn9tLlGUlZ6sc?7=)M`(4
zW!Qg-Y=8}MY@Rg*tyS_c>>6`3R>qS@v>u+0IoxTaP#1K}3o#C-hmy%lQyT8#zKVM#
z4Uvku>Z{{{P@x8@kW?EDHt1mEsu=c*AtL<W*6|J=((sm*%UvcLST~{m6hQ^b^y&q(
zCN^~@lxJlH>T3bVa|UnDG2i6{O4KSo{0{<lRKp^6YWM_8Dn2Dos|9gP+{qKZmE);0
zS&7f^xq>Fko_A)=q~VJza8->ZhRX%p7WWZR5T)TxQ=~Tk14y!Q%qh4T^SmW4v-PXL
z2M&qk3iO0c%^S!Wo@X*b(}?N$DO22j9`^Fw*Yl@F2yNnS<hMF;b;+56Bxh<QXR*2-
z&9vXZrz5l$e;ZfOl5W|~&)hOL{ead-T&%-09K$pP1$nz%0iU)oN#OpF;p({F8(qeZ
zXzU4gMOUyp9V=q*5{H9J%ZL`y8GVe_B98FgiFAv$g6=f!dzR7n1ZOLW+9d8a?qLT-
zbSIw0E?$^>aS9QcyfsLLew<@UCY5_3BQSu$5}-4*5rD!1%upq^CRbzJZAVqCa5+|3
z$Tnjr7%tbQOFjb)(I0WPhzoy@7H9s$GMY|H+LfY(@M1Z}_p}jxIl~x3zajL9^R6P2
zNtR_a)$uE~i5Frq)=|Vb|I<ahTwW{UCJk?i%=NMv2Z$5A%vBs`zAm1>ZfwO#qUb><
zE7F5LoaRR~Yfq55gsKIHVBt2AZsl){S>#xeJgs!pHT)rd$Ji=GJ|vDcZ3H(Supa_@
zXEe49H})8Q5ep^!DFOGjB@VBP;SDjoxm3hkl_IrDYV~s*Vv=F9Cc)xgtb*2AE`KN9
z#d}OESSCQ$ahvbsgA$M)K8pf3tza>|jE{c8$CWfeXH)E+B|`_jXu=oxk}mc5ienwV
X#y6Zd@mn`%@wXUE_?B~6t}p%tj^Ei&

literal 0
HcmV?d00001


From 58f2d3063776aabddcbe789af0b9e5e269b28cf8 Mon Sep 17 00:00:00 2001
From: Ian Arnold <iarnold1@ycp.edu>
Date: Thu, 11 Feb 2021 22:48:13 -0500
Subject: [PATCH 21/25] wider

---
 .gitignore                                    |   1 +
 .../ycp/cs320/movethesquare/ui/GameView.java  |   2 +-
 .../cs320/movethesquare/ui/GameView$2.class   | Bin 1859 -> 1859 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
index 674d86b..5e98f32 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -84,7 +84,7 @@ public void run() {
 				Square square = new Square();
 				square.setX(300.0);
 				square.setY(220.0);
-				square.setWidth(40.0);
+				square.setWidth(200.0);
 				square.setHeight(40.0);
 				model.setSquare(square);
 				
diff --git a/bin/edu/ycp/cs320/movethesquare/ui/GameView$2.class b/bin/edu/ycp/cs320/movethesquare/ui/GameView$2.class
index 70d5097cfc484b05402543b21c5c0b9816b3ca6e..678b4bbb0e123a1a9ffb569a901d018a03d4c7ba 100644
GIT binary patch
delta 14
VcmX@icbIR(aYn|>%_kVESph9A1%Utn

delta 14
VcmX@icbIR(aYn|J%_kVESph8%1$+Pi


From 239fc7070f223c3f8cabd4540b2c13b24fed4c90 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 17 Feb 2021 00:59:41 +0000
Subject: [PATCH 22/25] 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 <robjtede@icloud.com>
Date: Wed, 17 Feb 2021 01:00:18 +0000
Subject: [PATCH 23/25] 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 <adeiaxc@gmail.com>
Date: Tue, 16 Feb 2021 20:05:49 -0500
Subject: [PATCH 24/25] 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.
 

From c6fca5926aee77702c80bf64ccdd163881782c03 Mon Sep 17 00:00:00 2001
From: jgross11 <jgross11@ycp.edu>
Date: Wed, 17 Feb 2021 09:54:06 -0500
Subject: [PATCH 25/25] Super Important Contribution

---
 MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java | 2 --
 1 file changed, 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 8134bdc..3e478d8 100644
--- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
+++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
@@ -76,7 +76,6 @@ protected void paintComponent(Graphics g) {
 		// djh2-YCPlaptop: change from RED to YELLOW
 
 		g.setColor(Color.RED);
-=======
 
 		//g.setColor(Color.GREEN);
 
@@ -104,7 +103,6 @@ public void run() {
 
 				//uare.setWidth(60.0);
 				//uare.setHeight(25);
-=======
 
 				// lbradley1: change the size of the square to be smaller
 				square.setWidth(25.0);