Skip to content
Permalink
Browse files

Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git

Conflicts:
	bin/view/CharityWindow$2.class
	bin/view/CharityWindow$3.class
	bin/view/CharityWindow.class
  • Loading branch information
Joe Hill
Joe Hill committed Apr 25, 2017
2 parents d34d54a + 761816a commit deaa7291cf2f819fe2628aabfd144c002f0b83b9
Showing with 9 additions and 20 deletions.
  1. +0 −11 bin/.gitignore
  2. BIN bin/model/BigDealStack.class
  3. BIN bin/model/Card.class
  4. BIN bin/model/CardStack.class
  5. BIN bin/model/DealCard.class
  6. BIN bin/model/DealTile.class
  7. BIN bin/model/Die.class
  8. BIN bin/model/DoodadCard.class
  9. BIN bin/model/DoodadStack.class
  10. BIN bin/model/FinancialStatement.class
  11. BIN bin/model/MarketCard.class
  12. BIN bin/model/MarketStack.class
  13. BIN bin/model/OwnedRealEstate.class
  14. BIN bin/model/Profession.class
  15. BIN bin/model/Professions.class
  16. BIN bin/model/SmallDealStack.class
  17. BIN bin/model/Stock.class
  18. BIN bin/view/CharityWindow$2.class
  19. BIN bin/view/CharityWindow$3.class
  20. BIN bin/view/CharityWindow.class
  21. BIN bin/view/ChildWindow$1.class
  22. BIN bin/view/ChildWindow$2.class
  23. BIN bin/view/ChildWindow.class
  24. BIN bin/view/DealCardWindow$1.class
  25. BIN bin/view/DealCardWindow$2.class
  26. BIN bin/view/DealCardWindow$3$1.class
  27. BIN bin/view/DealCardWindow$3$2.class
  28. BIN bin/view/DealCardWindow$3.class
  29. BIN bin/view/DealCardWindow$4$1.class
  30. BIN bin/view/DealCardWindow$4$2.class
  31. BIN bin/view/DealCardWindow$4.class
  32. BIN bin/view/DealCardWindow.class
  33. BIN bin/view/DoodadCardWindow$1.class
  34. BIN bin/view/DoodadCardWindow$2.class
  35. BIN bin/view/DoodadCardWindow.class
  36. BIN bin/view/DownSizeWindow$1.class
  37. BIN bin/view/DownSizeWindow.class
  38. BIN bin/view/GameboardWindow.class
  39. BIN bin/view/MainWindow$1.class
  40. BIN bin/view/MainWindow.class
  41. BIN bin/view/MainWindow1$1.class
  42. BIN bin/view/MainWindow1.class
  43. BIN bin/view/Positioner.class
  44. BIN bin/view/SDStockCardWindow$1.class
  45. BIN bin/view/SDStockCardWindow$2.class
  46. BIN bin/view/SDStockCardWindow$3.class
  47. BIN bin/view/SDStockCardWindow.class
  48. BIN bin/view/Window.class
  49. +1 −1 src/model/DealTile.java
  50. +7 −4 src/view/GameboardWindow.java
  51. +1 −4 src/view/MainMenu.java
@@ -1,15 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
/.DS_Store
/controller/
/model/
<<<<<<< HEAD
>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
/view/
/Instructions.class
=======
/view/
>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
BIN +0 Bytes (100%) bin/model/BigDealStack.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/Card.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/CardStack.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/DealCard.class
Binary file not shown.
BIN -465 Bytes (80%) bin/model/DealTile.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/Die.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/DoodadCard.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/DoodadStack.class
Binary file not shown.
Binary file not shown.
BIN +0 Bytes (100%) bin/model/MarketCard.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/MarketStack.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/OwnedRealEstate.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/Profession.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/Professions.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/SmallDealStack.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/Stock.class
Binary file not shown.
BIN +822 Bytes (170%) bin/view/CharityWindow$2.class
Binary file not shown.
BIN +655 Bytes (160%) bin/view/CharityWindow$3.class
Binary file not shown.
BIN +342 Bytes (110%) bin/view/CharityWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/ChildWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/ChildWindow$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/ChildWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$3$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$3$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$3.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$4$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$4$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow$4.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DealCardWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DoodadCardWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DoodadCardWindow$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DoodadCardWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DownSizeWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/DownSizeWindow.class
Binary file not shown.
BIN +301 Bytes (110%) bin/view/GameboardWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/MainWindow$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/MainWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/MainWindow1$1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/MainWindow1.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/Positioner.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +0 Bytes (100%) bin/view/SDStockCardWindow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/Window.class
Binary file not shown.
@@ -21,7 +21,7 @@ public void getLandedOn(Player p)
{
// TODO
// Ask user to decide big/small deal:
CharityWindow charityWindow = new CharityWindow();
CharityWindow charityWindow = new CharityWindow();
charityWindow.showButtonDemo();


@@ -1,5 +1,6 @@
package view;
import model.*;

import controller.*;
import java.awt.*;
import java.util.ArrayList;
@@ -195,17 +196,19 @@ public void paintComponent(Graphics g) {

}

public void update() { //updates the location of the player on the board
for (int i = 0; i < Cashflow.numPlayers; i++) {
int x = (int) points[Player[i].getLocation()].getX(); // i will fix this later
int y = (int) points[Player[i].getLocation()].getY(); //
public void update(ArrayList<Player> _players) { //updates the location of the player on the board
for (int i = 0; i < _players.size(); i++) {
int x = (int) points[_players.get(i).getLocation()].getX(); // i will fix this later
int y = (int) points[_players.get(i).getLocation()].getY(); //
Positioners.get(i).setX(x);
Positioners.get(i).setY(y);

}

}






@@ -10,10 +10,7 @@

import javax.imageio.ImageIO;
import javax.swing.*;

import controller.Cashflow;
import model.Instructions;
import model.Player;

public class MainMenu
{
@@ -279,7 +276,7 @@ public void actionPerformed(ActionEvent e) {
frame.dispose();

//Cashflow.go(playerNames);
System.exit(0);
//System.exit(0);
}
});
return playerNames;

0 comments on commit deaa729

Please sign in to comment.
You can’t perform that action at this time.