Code

Dimas branch#9

Code

Open

dimaromaniv wants to merge 100 commits intoZCW-Java91:masterZCW-Java91/GroupCasino:masterfrom Casino-Chaching:DimasBranchCasino-Chaching/GroupCasino:DimasBranchCopy head branch name to clipboard

+2,130-27

Commits

Commits on Jul 17, 2023

• add comments

  dimaromaniv

  committed
  f5292a7

• testing merging to our group casino fork

  

  Christine

  authored and

  Christine

  committed
  66fe966

• Test

  Minsoo5

  committed
  9e3d6cd

• pr test

  oahmed105

  committed
  139b9d7

• Merge pull request #1 from ctgao/master

  Show description for 0fcab46
  ctgao

  authored
  0fcab46

• Merge pull request #2 from Minsoo5/master

  Show description for 1208081
  ctgao

  authored
  1208081

• testing

  Danielle-Greene

  committed
  1dbd6f4

• Merge pull request #3 from oahmed105/master

  Show description for a272a58
  ctgao

  authored
  a272a58

• check

  dimaromaniv

  committed
  2206dbc

• Merge pull request #4 from Danielle-Greene/master

  Show description for 313b216
  ctgao

  authored
  313b216

• Merge pull request #5 from dimaromaniv/master

  Show description for 6456987
  ctgao

  authored
  6456987

• UML Uploaded

  Danielle-Greene

  committed
  e570fbd

• Merge pull request #6 from Danielle-Greene/master

  Show description for 36a0c79
  ctgao

  authored
  36a0c79

• did some cleanup and got the UML

  

  Christine

  authored and

  Christine

  committed
  de16a87

• Merge pull request #7 from ctgao/master

  Show description for 61b2064
  ctgao

  authored
  61b2064

Commits on Jul 18, 2023

• Added the updated UML

  Minsoo5

  committed
  f3673ba

• Merge pull request #8 from Minsoo5/master

  Show description for 94d302a
  ctgao

  authored
  94d302a

• Added V3 UML

  Minsoo5

  committed
  8825fff

• Merge pull request #9 from Minsoo5/master

  Show description for 04e547b
  ctgao

  authored
  04e547b

Commits on Jul 19, 2023

• ulm update

  dimaromaniv

  committed
  67c1223

• Merge pull request #10 from dimaromaniv/master

  Show description for b6aaada
  ctgao

  authored
  b6aaada

• kjhgk

  dimaromaniv

  committed
  3676383

• wrote some basic enums for the playing card suit and playing card value

  

  Christine

  authored and

  Christine

  committed
  b4f99d7

• Casino Account and Tests Done

  Minsoo5

  committed
  24cb5b0

• Delete .DS_Store

  Minsoo5

  authored
  11fea92

• Add constructor

  dimaromaniv

  committed
  99b8e05

• Oopsy Files Gone

  Minsoo5

  committed
  a9a287f

• Merge branch 'master' of https://github.com/Casino-Chaching/GroupCasino

  dimaromaniv

  committed
  0a4cab0

• Merge pull request #12 from Minsoo5/master

  Show description for fe6c72f
  ctgao

  authored
  fe6c72f

• Still need to work on HouseAccout tests

  oahmed105

  committed
  235ea63

• finished card and test

  

  Christine

  authored and

  Christine

  committed
  35499b0

• Merge pull request #13 from oahmed105/master

  Show description for 873d406
  ctgao

  authored
  873d406

• Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

  

  Christine

  authored and

  Christine

  committed
  5b64989

• deleted the old UML

  

  Christine

  authored and

  Christine

  committed
  89bfc74

• Merge pull request #14 from ctgao/master

  Show description for 48669bf
  ctgao

  authored
  48669bf

Commits on Jul 20, 2023

• wrote the deck and it extends stack omg

  

  Christine

  authored and

  Christine

  committed
  0d5da2e

• Merge pull request #15 from ctgao/master

  Show description for a7c5b5b
  ctgao

  authored
  a7c5b5b

• i forgot to push these changes?

  

  Christine

  authored and

  Christine

  committed
  9a41931

• Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

  

  Christine

  authored and

  Christine

  committed
  18225fa

• created the hand of cards

  

  Christine

  authored and

  Christine

  committed
  5b9318e

• wrote a couple of tests, just wanted to understand exactly how the HandOfCards works

  

  Christine

  authored and

  Christine

  committed
  f170280

• Hand of cards is complete and tested

  

  Christine

  authored and

  Christine

  committed
  630eb41

• Merge pull request #16 from ctgao/master

  Show description for 77c7d17
  ctgao

  authored
  77c7d17

• GameInterface filled in

  Minsoo5

  committed
  5b271fe

• Added in GamblerInterface

  Minsoo5

  committed
  4381a27

• Merge pull request #17 from Minsoo5/master

  Show description for 4a66a54
  ctgao

  authored
  4a66a54

• HouseAccount and HouseAccountTest completed

  oahmed105

  committed
  76183a4

• GambleGameInterface added

  Minsoo5

  committed
  70f437a

• GambleGameInterface added

  Minsoo5

  committed
  c9fc01a

• HouseAccount and HouseAccountTest completed

  oahmed105

  committed
  e165af8

• Merge remote-tracking branch 'origin/master'

  Minsoo5

  committed
  0f0f6da

• Merge remote-tracking branch 'origin/master'

  oahmed105

  committed
  dc36ea6

• some changes with playerClass

  dimaromaniv

  committed
  41cb528

• Merge pull request #19 from oahmed105/master

  Show description for fd57c4e
  ctgao

  authored
  fd57c4e

• Merge pull request #18 from Minsoo5/master

  Show description for 835d089
  ctgao

  authored
  835d089

• just commiting simple card game and card player stuff

  

  Christine

  authored and

  Christine

  committed
  f0e284c

• Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

  

  Christine

  authored and

  Christine

  committed
  88b8165

• Merge branch 'master' into master

  dimaromaniv

  authored
  ad6363e

• Merge pull request #20 from Minsoo5/master

  Show description for 51af5d6
  ctgao

  authored
  51af5d6

• Update MainApplication.java

  ctgao

  authored
  72020e6

• Merge pull request #21 from dimaromaniv/master

  Show description for 77e74cd
  ctgao

  authored
  77e74cd

• finished typing up card player

  

  Christine

  authored and

  Christine

  committed
  3ab94d5

• Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

  

  Christine

  authored and

  Christine

  committed
  5184c1c

• committing to pull

  Danielle-Greene

  committed
  b8d1a6f

• Merge branch 'master' into master

  ctgao

  authored
  c08e0b5

• Merge pull request #24 from ctgao/master

  Show description for 3797a32
  ctgao

  authored
  3797a32

• edited minor things

  

  Christine

  authored and

  Christine

  committed
  fbdc220

• Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

  

  Christine

  authored and

  Christine

  committed
  c92ed01

• just some file cleaning up - making sure all references are correct - only note is that player test is an abstract class and that's why the playerclass tests are all red

  

  Christine

  authored and

  Christine

  committed
  e51b8cb

• Merge pull request #25 from ctgao/master

  Show description for fa857f7
  ctgao

  authored
  fa857f7

• Saving Roulette Work

  Minsoo5

  committed
  f162a20

• commit

  oahmed105

  committed
  912125c

• finished up card player and some other things

  

  Christine

  authored and

  Christine

  committed
  61e713d

• Merge pull request #27 from ctgao/master

  Show description for fc798c3
  ctgao

  authored
  fc798c3

• NumberGuessPlayer and NumberGuessPlayer tests completed

  oahmed105

  committed
  5e062cc

• RouletteNum Enums Set ;)

  Minsoo5

  committed
  53403d0

• enums

  Minsoo5

  committed
  df965d9

• finished up card player and some other things

  

  Christine

  authored and

  Minsoo5

  committed
  8d60f65

• Merge pull request #29 from Minsoo5/master

  Show description for b863975
  ctgao

  authored
  b863975

• Merge branch 'master' into master

  ctgao

  authored
  a8b1576

• Merge pull request #28 from oahmed105/master

  Show description for b94693b
  ctgao

  authored
  b94693b

Commits on Jul 21, 2023

• check

  dimaromaniv

  committed
  df87d5c

• Test

  dimaromaniv

  committed
  3886e73

• made some critical changes to Card stuff

  

  Christine

  authored and

  Christine

  committed
  acb897e

• started working on blackjack

  

  Christine

  authored and

  Christine

  committed
  1adfc87

• Merge pull request #30 from Casino-Chaching/christine

  Show description for c215327
  ctgao

  authored
  c215327

• Finished one thing but added many more problems

  oahmed105

  committed
  1d58bcb

• finished writing blackjack game i think

  

  Christine

  authored and

  Christine

  committed
  ed7520d

• had to make some changes to the casino account

  

  Christine

  authored and

  Christine

  committed
  97cf83d

• implemented casino account manager stuff last minute and made tweaks to blackjack

  

  Christine

  authored and

  Christine

  committed
  7f51f0b

• Merge pull request #31 from Casino-Chaching/osamasBranch

  Show description for 295770b
  ctgao

  authored
  295770b

• Update SlotsGame.java

  Show description for acc7d0d
  dimaromaniv

  committed
  acc7d0d

• merging master into christine

  

  Christine

  authored and

  Christine

  committed
  355e803

• now we can make account and kinda play number guess game

  

  Christine

  authored and

  Christine

  committed
  2e12a65

• something went wrong

  dimaromaniv

  committed
  f867b6f

• made sure the house account can communicate with the games

  

  Christine

  authored and

  Christine

  committed
  6efbb9f

• Merge pull request #32 from Casino-Chaching/master

  Show description for 94abe87
  dimaromaniv

  authored
  94abe87

• made some minor changes

  

  Christine

  authored and

  Christine

  committed
  208381d

• made sure singleton is good

  

  Christine

  authored and

  Christine

  committed
  ecc3806

• i need help

  dimaromaniv

  committed
  97371d6