Code

F17_lab05#77

Code

Merged

scottpchow23 merged 34 commits intoucsb-cs56-projects:masterucsb-cs56-projects/cs56-games-blackjack:masterfrom ryankirkpatrick97:masterryankirkpatrick97/cs56-games-blackjack:masterCopy head branch name to clipboardNov 16, 2017

+2,007-1,575

Commits

Commits on Nov 8, 2017

• Factor out main into Controller.java

  ryanlorica

  committed
  51bc234

  Copy full SHA for 51bc234

• Added a Todo list for the project

  

  Ryan C. Kirkpatrick

  committed
  6f01380

  Copy full SHA for 6f01380

• Added some initial files to start separating the individual guis

  

  Ryan C. Kirkpatrick

  committed
  c0bddd1

  Copy full SHA for c0bddd1

• Factor out main into Main.java

  ryanlorica

  committed
  56d80a9

  Copy full SHA for 56d80a9

Commits on Nov 10, 2017

• Factor out controll for Rules and Welcome screens

  ryanlorica

  committed
  da665e5

  Copy full SHA for da665e5

Commits on Nov 11, 2017

• Create controllers for all but the table

  ryanlorica

  committed
  f7cc9ce

  Copy full SHA for f7cc9ce

• Fix BeginGameListener

  ryanlorica

  committed
  6067b33

  Copy full SHA for 6067b33

• Factor out all Listeners from BlackjackGui.java

  ryanlorica

  committed
  5b4c6cf

  Copy full SHA for 5b4c6cf

• The commit that was supposed to be last commit

  ryanlorica

  committed
  50a2da9

  Copy full SHA for 50a2da9

Commits on Nov 12, 2017

• WIP RK Added some GUI files

  

  Ryan C. Kirkpatrick

  committed
  c640254

  Copy full SHA for c640254

• Deleting save

  

  Ryan C. Kirkpatrick

  committed
  dcccc5e

  Copy full SHA for dcccc5e

• Added Gui files

  

  Ryan C. Kirkpatrick

  committed
  50ae872

  Copy full SHA for 50ae872

• Trying to add gui files

  

  Ryan C. Kirkpatrick

  committed
  6db7b1f

  Copy full SHA for 6db7b1f

• Modified some files to try to retrieve stash

  

  Ryan C. Kirkpatrick

  committed
  7f27ecd

  Copy full SHA for 7f27ecd

• Finally fixed missing files

  

  Ryan C. Kirkpatrick

  committed
  1aec045

  Copy full SHA for 1aec045

• Removed jar file

  

  Ryan C. Kirkpatrick

  committed
  87f30ef

  Copy full SHA for 87f30ef

• Finally merged the two branches together properly

  

  Ryan C. Kirkpatrick

  committed
  ffe3e5b

  Copy full SHA for ffe3e5b

• Changed the way that cards are named for more compressed image calling

  

  Ryan C. Kirkpatrick

  committed
  1da903f

  Copy full SHA for 1da903f

• Reset the card naming back to the original to maintain test functionality, but remove spaces when creating image icons

  

  Ryan C. Kirkpatrick

  committed
  cee4a6a

  Copy full SHA for cee4a6a

• Remainder of build/images being deleted

  

  Ryan C. Kirkpatrick

  committed
  c50cf78

  Copy full SHA for c50cf78

• Removed WelcomeGui from BlackJackGui

  

  Ryan C. Kirkpatrick

  committed
  23e55cf

  Copy full SHA for 23e55cf

• Pulled out RulesGui

  

  Ryan C. Kirkpatrick

  committed
  4d676f3

  Copy full SHA for 4d676f3

• Separated NameGui from BlackJackGui

  

  Ryan C. Kirkpatrick

  committed
  0f4d9a0

  Copy full SHA for 0f4d9a0

• Removed the ridiculous notion of having a BlackjackGui 'theGui' within a BlackjackGui, rather than just calling 'this'

  

  Ryan C. Kirkpatrick

  committed
  da98216

  Copy full SHA for da98216

Commits on Nov 13, 2017

• Added BetGui and modified BetWindowController

  

  Ryan C. Kirkpatrick

  committed
  a12da3f

  Copy full SHA for a12da3f

• Started adding GUI manipulation to the menu

  

  Ryan C. Kirkpatrick

  committed
  12bf188

  Copy full SHA for 12bf188

• Fixed errors with menu. It now has the proper functionality. However, I ended up changing the bug for changing player names, to just not work, rather than restarting the game completely

  

  Ryan C. Kirkpatrick

  committed
  64a1352

  Copy full SHA for 64a1352

• Fixed bug where totalPot amount was double what it should be

  

  Ryan C. Kirkpatrick

  committed
  187b2ea

  Copy full SHA for 187b2ea

• Merged refactor into master

  

  Ryan C. Kirkpatrick

  committed
  cdd14b8

  Copy full SHA for cdd14b8

• Merged GuiSeparation into master

  

  Ryan C. Kirkpatrick

  committed
  d147ffa

  Copy full SHA for d147ffa

• Fixed merge conflicts

  

  Ryan C. Kirkpatrick

  committed
  82cc388

  Copy full SHA for 82cc388

• Added things todo for the next legacy lab

  

  Ryan C. Kirkpatrick

  committed
  2664522

  Copy full SHA for 2664522

Commits on Nov 16, 2017

• Added a test for the getMyImage function in BlackjackGui

  

  Ryan C. Kirkpatrick

  committed
  9f7ab60

  Copy full SHA for 9f7ab60

• Added javadoc comment to new test_getMyImage function in BlackjackTest.java

  

  Ryan C. Kirkpatrick

  committed
  62c23d1

  Copy full SHA for 62c23d1