Code

I need!!#3

Code

Open

lthomas4912 wants to merge 159 commits intoZipCodeCore:masterZipCodeCore/GroupCasino:masterfrom ElBell:masterElBell/Maven.Casino:masterCopy head branch name to clipboard

+6,592-16

Commits

Commits on Feb 22, 2019

• Added Untitled Diagram.xml

  ElBell

  committed
  37cbfbb

• Update Untitled Diagram.xml

  ElBell

  committed
  ac91aae

• Added the basics for everyone to build from

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  1594551

• Started on the Casino and Greeter

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  5ca1132

• Added tests for Console

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  d816806

• Made a default console

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  02037a9

• Merge branch 'working' of https://github.com/ElBell/Maven.Casino into CrapsDev

  MDMoll

  committed
  184a66f

• Merge branch 'working' of https://github.com/ElBell/Maven.Casino into GoFish

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  164c5b1

• Merge branch 'working' of https://github.com/ElBell/Maven.Casino into macao

  ashblox

  committed
  c7c2e2d

• to String() added for Card

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  f53a8c4

Commits on Feb 23, 2019

• card tests

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  45cd0e9

• added enum changes for rank.

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  949cbfa

• Added the first draft at GoFish

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  b48ce73

• fixed null pointer exception

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  5885e16

• merged in Elenor's changes

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  6cfc94e

• Merge https://github.com/clm5506/Maven.Casino

  jlysglo

  committed
  efe6cc7

• black jack change to display user cards on first deal

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  b07f212

• Merge pull request #1 from clm5506/blackJack

  Show description for 390e52e
  ElBell

  authored
  390e52e

• Non-working Craps skeleton

  MDMoll

  committed
  3dca74d

• worked on macao

  ashblox

  committed
  9a387f0

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino into macao

  ashblox

  committed
  25570ff

• Basic tests, more needed

  MDMoll

  committed
  fdabaf8

• Merge https://github.com/ElBell/Maven.Casino into LBlackJackCode

  jlysglo

  committed
  37644ec

• moved BlackJack

  MDMoll

  committed
  c7c8dd8

• Moved CardTest.java

  MDMoll

  committed
  a3fa30b

• Updated pom.xml to with explicit mention of Maven 1.8 and other Craps stuff

  MDMoll

  committed
  7d5fde5

• Updated Craps and whatnot

  MDMoll

  committed
  c6bc1d0

• finished macao

  ashblox

  committed
  fc19fd0

• Made GoFish play down with books (4 cards), another turn when you guess right, and more checks

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  0d73bf5

• Fixed merge conflict

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  c3a92b0

• minor changes

  ashblox

  committed
  055f56d

• Made more tests for Casino

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  4273bed

• Merge pull request #2 from ashblox/macao

  Show description for d62d1d7
  ElBell

  authored
  d62d1d7

• created getters & setters

  ashblox

  committed
  f9805f3

• BlackJack evolved

  jlysglo

  committed
  cccc65c

• Merge pull request #3 from lthomas4912/BlackJackCode

  Show description for 1611519
  ElBell

  authored
  1611519

• committing for merge

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  e18828b

• merged in Leah's changed

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  6944996

• Got to 100% test coverage on GoFish player

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  70820a1

• Wrote some tests

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  0071ada

• Pulled down BlackJack and Macao

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  6560165

• Merge branch 'working'

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  af5d7fb

• Got GoFish working again

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  a4aadee

• added additional black methods for dealerturn checkIfhandis21

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  ee937d1

Commits on Feb 24, 2019

• double down features added

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  edb28cd

• commit to pull

  jlysglo

  committed
  384759c

• mered with cris

  jlysglo

  committed
  cdee1db

• We Good

  jlysglo

  committed
  4013ca1

• Basic Dice class with roll method

  MDMoll

  committed
  b7e532e

• Mostly working Craps simulation

  MDMoll

  committed
  77bf8d1

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  889a79d

• working on tests

  ashblox

  committed
  8481edb

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino into macao

  ashblox

  committed
  4c1c90b

• commit to pull

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  5d75e81

• fixed merge conflict

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  b539dfa

• finished macao tests

  ashblox

  committed
  1a2a14a

• Added cute cards and titles

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  df66e99

• added logic to handle user error

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  6452775

• more testing

  ashblox

  committed
  a80825f

• Added faces for dice

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  8fcfcaa

• refactored redundant code

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  267c131

• resolved merge conflicts

  ashblox

  committed
  306fdef

Commits on Feb 25, 2019

• We Better

  jlysglo

  committed
  856023a

• We mo betta

  jlysglo

  committed
  8796cee

• Added more tests to GoFish

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  0830467

• Merge pull request #4 from ashblox/macao

  Show description for 2b457bf
  ElBell

  authored
  2b457bf

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  98931aa

• Merge branch 'working'

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  2d1f859

• Merged and fixed some tests inGoFish and Macao

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  2f11b29

• finished testing

  ashblox

  committed
  f6a44f0

• Added a card back

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  96e0f98

• Aces Yo

  jlysglo

  committed
  4fc4ae8

• Added Test

  jlysglo

  committed
  9d0a80b

• finished game

  ashblox

  committed
  3ad333e

• resolved conflicts

  ashblox

  committed
  c81d84b

• Added card backs and more tests

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  aeae0cc

• added additional tests

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  bf3c504

• Merge branch 'master' into macao

  ElBell

  authored
  a193d6f

• minor changes to game and rank and greeter classes

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  175438e

• added tests

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  622b55d

• Merge pull request #5 from ashblox/macao

  Show description for 67535e4
  ElBell

  authored
  67535e4

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  793de07

• Fixed some merge issues. Passing all tests. Macao officially in and completed

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  8ddd376

• Created GameEnum to call new games based user input

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  fe92065

• 48percent bish

  jlysglo

  committed
  302f91b

• Turned massive switch case into a HashMap<String, enum Rank>

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  0091164

• We got cards

  jlysglo

  committed
  e67b4d5

• Merge https://github.com/ElBell/Maven.Casino into BlackJackCode

  jlysglo

  committed
  0eda46e

• Merge pull request #6 from lthomas4912/BlackJackCode

  Show description for 5a6b4d3
  ElBell

  authored
  5a6b4d3

Commits on Feb 26, 2019

• last commit

  ashblox

  committed
  788736a

• resolved conflicts

  ashblox

  committed
  3087ac9

• Made game an interface and made play() return void

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  b35c4ae

• added more unit tests and refactored code

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  165236c

• merged in changes to push

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  518ac68

• updates

  MDMoll

  committed
  69755ce

• Changed Play() to void everywhere

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  615d388

• Merge pull request #7 from clm5506/blackJack

  Show description for 9e2f25e
  ElBell

  authored
  9e2f25e

• Fixed some tests, moved games to the proper folder, and renamed to CardsAndDice

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  c960f2e

• Added some test for card back and changed standardInput to use input in console

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  5f4d310

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino into macao

  ashblox

  committed
  cb2a47d

• Craps nearly fully functional

  MDMoll

  committed
  92ef032

• Beginning to integrate with casino skeleton

  MDMoll

  committed
  3f7f7ea

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  ee605e5

• Updated with changes in main

  MDMoll

  committed
  20e9fe4

• Merge pull request #8 from MDMoll/master

  Show description for 45cdb3f
  ElBell

  authored
  45cdb3f

• Little gofish change

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  0486a7a

• Merged in the Craps game

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  57323fd

• Get user balance correctly linked

  MDMoll

  committed
  724fa64

• User balance should be correctly linked now across profiles

  MDMoll

  committed
  b4d0f1e

• Quitting and Continuing menu options work properly now

  MDMoll

  committed
  3166b1d

• Merge pull request #9 from MDMoll/master

  Show description for 7bf7c0d
  ElBell

  authored
  7bf7c0d

• Merge branch 'working' of https://github.com/ElBell/Maven.Casino

  ashblox

  committed
  9fa7446

• Replaced system.out.printlns with calls to the console

  MDMoll

  committed
  e3703a4

• started craps testing

  ashblox

  committed
  45c8713

• Merge pull request #10 from MDMoll/master

  Show description for 8dc51a2
  MDMoll

  authored
  8dc51a2

• Merge pull request #11 from ashblox/master

  Show description for 818cc9f
  MDMoll

  authored
  818cc9f

• fixed test class

  ashblox

  committed
  c2795f2

• Merge pull request #12 from ashblox/master

  Show description for c4ae54a
  MDMoll

  authored
  c4ae54a

• more tests and some minor mods

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  c12ef02

• added test for hit

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  c243396

• Improved loop behavior for easier future testability

  MDMoll

  committed
  8a1f444

• Merge pull request #13 from clm5506/blackJack

  Show description for 4093e47
  ElBell

  authored
  4093e47

• Merge pull request #14 from MDMoll/master

  Show description for 8534e9c
  ElBell

  authored
  8534e9c

• test work

  ashblox

  committed
  92d4227

• Balance working

  MDMoll

  committed
  24a0a90

• Merge pull request #16 from MDMoll/master

  Show description for efa4959
  ElBell

  authored
  efa4959

• resolved conflicts

  ashblox

  committed
  1ac222d

• added more tests

  

  Cristina McClintock

  authored and

  Cristina McClintock

  committed
  1398dbd

• committing some test stuff

  ashblox

  committed
  65b2ff1

• Added colors

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  0340987

• fixed the colors

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  12cc2eb

• Merge pull request #17 from clm5506/blackJack

  Show description for 815b1a0
  MDMoll

  authored
  815b1a0

Commits on Feb 27, 2019

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  9e1eb99

• Merge branch 'working' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  4ca08fe

• Merge pull request #18 from ashblox/master

  Show description for 0e56261
  MDMoll

  authored
  0e56261

• updated with tests

  MDMoll

  committed
  dc48a94

• finished tests/incorporated die

  ashblox

  committed
  fb3dc09

• minor changes

  ashblox

  committed
  e1a35e9

• Merge pull request #20 from ashblox/master

  Show description for 820dd3f
  ElBell

  authored
  820dd3f

• Last changes

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  36c03dc

• final draft:

  Show description for 8d229d4
  ashblox

  committed
  8d229d4

• Merge pull request #21 from ashblox/master

  Show description for acdb95d
  ElBell

  authored
  acdb95d

• Merged in blackjack

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  f194ac5

• merged in craps

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  6b4aa19

• Fixed a bunch of tests

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  165c03f

• Removed unnessecary imports and make everything that could be private or package private.

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  041fa7b

• Got profile to be added correctly to all the players

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  f504995

• pulled from Master

  MDMoll

  committed
  d0bf86c

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  3a95375

• We really only need one loaded die

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  c3c4374

• changed project structure

  

  Eleonor Bart

  authored and

  Eleonor Bart

  committed
  ef97c6e

• Craps refactored to work with game status

  MDMoll

  committed
  2c63baf

Commits on Feb 28, 2019

• Streamlined program and updated tests

  MDMoll

  committed
  fd465e8

• Merge branch 'master' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  70b2086

• Merge pull request #1 from MDMoll/CrapsRefactor

  Show description for fe33815
  MDMoll

  authored
  fe33815

• Merge branch 'master' of https://github.com/MDMoll/Maven.Casino

  MDMoll

  committed
  749ca46

• Merge branch 'working' of https://github.com/ElBell/Maven.Casino

  MDMoll

  committed
  959870c

• Craps and CrapsPlayer updated with new logic

  MDMoll

  committed
  26c7efc

• Merge pull request #22 from MDMoll/master

  Show description for 5bd0d50
  ElBell

  authored
  5bd0d50