Skip to content
Permalink
Branch: master
Commits on Apr 25, 2017
  1. Merge branch 'master' of

    afortuna2016
    afortuna2016 committed Apr 25, 2017
  2. deleted a few things

    afortuna2016
    afortuna2016 committed Apr 25, 2017
  3. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 25, 2017
    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
  4. Did some GUI stuff

    Joe Hill
    Joe Hill committed Apr 25, 2017
  5. Did some GUI

    Joe Hill
    Joe Hill committed Apr 25, 2017
  6. this probably wont work

    jackie
    jackie committed Apr 25, 2017
Commits on Apr 23, 2017
  1. removed unused imports

    afortuna2016
    afortuna2016 committed Apr 23, 2017
  2. commented out the system.exit line

    afortuna2016
    afortuna2016 committed Apr 23, 2017
  3. asdf

    Joe Hill
    Joe Hill committed Apr 23, 2017
  4. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 23, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/controller/Cashflow.class
    	src/view/MainMenu.java
  5. egit hates me

    jjv14001 committed Apr 23, 2017
  6. egit hates me

    jjv14001 committed Apr 23, 2017
  7. Update Cashflow.java

    jjv14001 committed Apr 23, 2017
  8. Update GameboardWindow.java

    jjv14001 committed Apr 23, 2017
  9. trying to pull

    Joe Hill
    Joe Hill committed Apr 23, 2017
  10. Merge branch 'master' of

    afortuna2016
    afortuna2016 committed Apr 23, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/controller/Cashflow.class
    	bin/model/FinancialStatement.class
    	bin/model/Player.class
  11. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 23, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/model/FinancialStatement.class
    	bin/view/FSWindow.class
  12. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 23, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/controller/Cashflow.class
    	bin/model/FinancialStatement.class
    	bin/view/FSWindow.class
    	src/view/FSWindow.java
  13. assigning player namessss

    afortuna2016
    afortuna2016 committed Apr 23, 2017
  14. endturn button added to maintab

    Sadiya Sadiya
    Sadiya authored and Sadiya committed Apr 23, 2017
  15. The numbers that weren't showing in tab 1 should show now.

    Sara-Sadiya Sara-Sadiya
    Sara-Sadiya authored and Sara-Sadiya committed Apr 23, 2017
  16. trying to pull

    Joe Hill
    Joe Hill committed Apr 23, 2017
  17. got rid of git's comments

    Sara-Sadiya Sara-Sadiya
    Sara-Sadiya authored and Sara-Sadiya committed Apr 23, 2017
Commits on Apr 22, 2017
  1. player names

    afortuna2016
    afortuna2016 committed Apr 22, 2017
  2. can pick players now

    afortuna2016
    afortuna2016 committed Apr 22, 2017
  3. main menuuu

    afortuna2016
    afortuna2016 committed Apr 22, 2017
  4. main menu

    afortuna2016
    afortuna2016 committed Apr 22, 2017
  5. Merge branch 'master' of

    afortuna2016
    afortuna2016 committed Apr 22, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/.gitignore
    	bin/controller/Cashflow.class
    	bin/view/GameboardWindow.class
    	bin/view/TileButton.class
    	src/view/MainMenu.java
  6. main menu

    afortuna2016
    afortuna2016 committed Apr 22, 2017
  7. ahhhhhhhhhhhh

    jackie
    jackie committed Apr 22, 2017
  8. Create MainMenu.java

    amf14004 committed Apr 22, 2017
Commits on Apr 21, 2017
  1. main menu

    amf14004 committed Apr 21, 2017
  2. trying to pull

    jackie
    jackie committed Apr 21, 2017
Older
You can’t perform that action at this time.