Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Khunt6 #5

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3753299
changed square size
ksmith6767 Feb 8, 2021
415c13b
changed size again
ksmith6767 Feb 8, 2021
dab2045
Update GameView.java
huntress284 Feb 9, 2021
9a56694
Changed square size, color and speed.
DonaldHakeII Mar 5, 2017
f15d4a4
Update GameView.java
huntress284 Feb 10, 2021
9cea39d
Added & applied new background color
Derek-Herr77 Feb 10, 2021
cd4cc96
changed color and size
sausan22 Feb 11, 2021
cc6b13e
Update GameView.java
jack16816 Feb 11, 2021
d31a85a
made wider
iarnold885113 Feb 12, 2021
58f2d30
wider
iarnold885113 Feb 12, 2021
239fc70
circles are better
robjtede Feb 17, 2021
5dd7405
l33tsp3ak
robjtede Feb 17, 2021
8745dbb
Merge pull request #23 from robjtede/ilikecircle
KaiFish Feb 17, 2021
2eb58cc
Merge branch 'master' into coolkid
KaiFish Feb 17, 2021
76b6706
Merge pull request #24 from robjtede/coolkid
KaiFish Feb 17, 2021
d0b6f79
Update README.md
KaiFish Feb 17, 2021
ea48537
Merge pull request #8 from KaiFish/jquinteros
KaiFish Feb 17, 2021
e449c70
Merge branch 'master' into dherr
KaiFish Feb 17, 2021
78550c9
Merge pull request #19 from KaiFish/dherr
KaiFish Feb 17, 2021
bd5f742
Merge pull request #3 from KaiFish/ksmith126
ksmith6767 Feb 17, 2021
9df9bab
Merge branch 'master' into jsnyder17
ksmith6767 Feb 17, 2021
eac2f1b
Merge branch 'master' into ssanjuan1
jack16816 Feb 17, 2021
9ac801a
Merge pull request #22 from KaiFish/jsnyder17
ksmith6767 Feb 17, 2021
b13a480
Merge branch 'attempt3' into khunt6
jsnyder17 Feb 17, 2021
1f93155
Merge pull request #7 from KaiFish/ssanjuan1
jack16816 Feb 17, 2021
bdf7821
Merge branch 'master' into khunt6
jack16816 Feb 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
26 changes: 23 additions & 3 deletions MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
import edu.ycp.cs320.movethesquare.model.Square;

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 static final Color RED = new Color(100, 0, 0);

private Game model;
private GameController controller;
Expand All @@ -26,7 +30,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);


//dherr: applied new background color
setBackground( Sunset_Red);


// djh2-KEC119-21: changed from 30 to 45
// djh2-YCPlaptop: change from 45 to 100
Expand Down Expand Up @@ -66,7 +74,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);

g.setColor(Color.RED);

Square square = model.getSquare();

Expand All @@ -84,8 +93,19 @@ public void run() {
Square square = new Square();
square.setX(300.0);
square.setY(220.0);
square.setWidth(40.0);

square.setWidth(200.0);
attempt3
square.setHeight(40.0);

square.setWidth(30.0);
square.setHeight(30.0);

//ksmith126 changed the block size
square.setWidth(70.0);
square.setHeight(80.0);


model.setSquare(square);

GameController controller = new GameController();
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
MoveTheSquare
=============

The game engine for the next great indie game.

Expand Down
Binary file not shown.
Binary file added bin/edu/ycp/cs320/movethesquare/model/Game.class
Binary file not shown.
Binary file not shown.
Binary file added bin/edu/ycp/cs320/movethesquare/ui/GameView$1.class
Binary file not shown.
Binary file not shown.
Binary file added bin/edu/ycp/cs320/movethesquare/ui/GameView.class
Binary file not shown.