Dimas branch#9

Open

dimaromaniv wants to merge 100 commits intoZCW-Java91:masterfrom

Casino-Chaching:DimasBranch

Commits on Jul 17, 2023

add comments
dimaromaniv
committed
testing merging to our group casino fork

Christine
authored and
Christine
committed
Test
Minsoo5
committed
pr test
oahmed105
committed
Merge pull request #1 from ctgao/master
ctgao
authored
Merge pull request #2 from Minsoo5/master
ctgao
authored
testing
Danielle-Greene
committed
Merge pull request #3 from oahmed105/master
ctgao
authored
check
dimaromaniv
committed
Merge pull request #4 from Danielle-Greene/master
ctgao
authored
Merge pull request #5 from dimaromaniv/master
ctgao
authored
UML Uploaded
Danielle-Greene
committed
Merge pull request #6 from Danielle-Greene/master
ctgao
authored
did some cleanup and got the UML

Christine
authored and
Christine
committed
Merge pull request #7 from ctgao/master
ctgao
authored

Commits on Jul 19, 2023

ulm update
dimaromaniv
committed
Merge pull request #10 from dimaromaniv/master
ctgao
authored
kjhgk
dimaromaniv
committed
wrote some basic enums for the playing card suit and playing card value

Christine
authored and
Christine
committed
Casino Account and Tests Done
Minsoo5
committed
Delete .DS_Store
Minsoo5
authored
Add constructor
dimaromaniv
committed
Oopsy Files Gone
Minsoo5
committed
Merge branch 'master' of https://github.com/Casino-Chaching/GroupCasino
dimaromaniv
committed
Merge pull request #12 from Minsoo5/master
ctgao
authored
Still need to work on HouseAccout tests
oahmed105
committed
finished card and test

Christine
authored and
Christine
committed
Merge pull request #13 from oahmed105/master
ctgao
authored
Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

Christine
authored and
Christine
committed
deleted the old UML

Christine
authored and
Christine
committed
Merge pull request #14 from ctgao/master
ctgao
authored

Commits on Jul 20, 2023

wrote the deck and it extends stack omg

Christine
authored and
Christine
committed
Merge pull request #15 from ctgao/master
ctgao
authored
i forgot to push these changes?

Christine
authored and
Christine
committed
Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

Christine
authored and
Christine
committed
created the hand of cards

Christine
authored and
Christine
committed
wrote a couple of tests, just wanted to understand exactly how the HandOfCards works

Christine
authored and
Christine
committed
Hand of cards is complete and tested

Christine
authored and
Christine
committed
Merge pull request #16 from ctgao/master
ctgao
authored
GameInterface filled in
Minsoo5
committed
Added in GamblerInterface
Minsoo5
committed
Merge pull request #17 from Minsoo5/master
ctgao
authored
HouseAccount and HouseAccountTest completed
oahmed105
committed
GambleGameInterface added
Minsoo5
committed
GambleGameInterface added
Minsoo5
committed
HouseAccount and HouseAccountTest completed
oahmed105
committed
Merge remote-tracking branch 'origin/master'
Minsoo5
committed
Merge remote-tracking branch 'origin/master'
oahmed105
committed
some changes with playerClass
dimaromaniv
committed
Merge pull request #19 from oahmed105/master
ctgao
authored
Merge pull request #18 from Minsoo5/master
ctgao
authored
just commiting simple card game and card player stuff

Christine
authored and
Christine
committed
Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

Christine
authored and
Christine
committed
Merge branch 'master' into master
dimaromaniv
authored
Merge pull request #20 from Minsoo5/master
ctgao
authored
Update MainApplication.java
ctgao
authored
Merge pull request #21 from dimaromaniv/master
ctgao
authored
finished typing up card player

Christine
authored and
Christine
committed
Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

Christine
authored and
Christine
committed
committing to pull
Danielle-Greene
committed
Merge branch 'master' into master
ctgao
authored
Merge pull request #24 from ctgao/master
ctgao
authored
edited minor things

Christine
authored and
Christine
committed
Merge branch 'master' of github.com:Casino-Chaching/GroupCasino

Christine
authored and
Christine
committed
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
Merge pull request #25 from ctgao/master
ctgao
authored
Saving Roulette Work
Minsoo5
committed
commit
oahmed105
committed
finished up card player and some other things

Christine
authored and
Christine
committed
Merge pull request #27 from ctgao/master
ctgao
authored
NumberGuessPlayer and NumberGuessPlayer tests completed
oahmed105
committed
RouletteNum Enums Set ;)
Minsoo5
committed
enums
Minsoo5
committed
finished up card player and some other things

Christine
authored and
Minsoo5
committed
Merge pull request #29 from Minsoo5/master
ctgao
authored
Merge branch 'master' into master
ctgao
authored
Merge pull request #28 from oahmed105/master
ctgao
authored

Commits on Jul 21, 2023

check
dimaromaniv
committed
Test
dimaromaniv
committed
made some critical changes to Card stuff

Christine
authored and
Christine
committed
started working on blackjack

Christine
authored and
Christine
committed
Merge pull request #30 from Casino-Chaching/christine
ctgao
authored
Finished one thing but added many more problems
oahmed105
committed
finished writing blackjack game i think

Christine
authored and
Christine
committed
had to make some changes to the casino account

Christine
authored and
Christine
committed
implemented casino account manager stuff last minute and made tweaks to blackjack

Christine
authored and
Christine
committed
Merge pull request #31 from Casino-Chaching/osamasBranch
ctgao
authored
Update SlotsGame.java
dimaromaniv
committed
merging master into christine

Christine
authored and
Christine
committed
now we can make account and kinda play number guess game

Christine
authored and
Christine
committed
something went wrong
dimaromaniv
committed
made sure the house account can communicate with the games

Christine
authored and
Christine
committed
Merge pull request #32 from Casino-Chaching/master
dimaromaniv
authored
made some minor changes

Christine
authored and
Christine
committed
made sure singleton is good

Christine
authored and
Christine
committed
i need help
dimaromaniv
committed