Feature/dipinti test files - #38

Open

Dipinti3 wants to merge 151 commits into

ZipCodeCore:masterfrom

Casino-Royale:feature/DipintiTestFiles

Commits on Jul 13, 2021

Star squad
Nick
committed
b7bd1c0
edited GameInterface

Nathan
authored and
Nathan
committed
05d5a74
Merge pull request #1 from NicholasWolak/master
NicholasWolak
authored
aff72a2
completed Dice class and tests

Zach
authored and
Zach
committed
37cd7b0
Merge pull request #2 from ZachSinger/master
ZachSinger
authored
abb420b
Merge pull request #3 from Casino-Royale/master
NicholasWolak
authored
9c56a53
Merge branch 'Casino-Royale:master' into master
NicholasWolak
authored
1da0132
started slots class

Nathan
authored and
Nathan
committed
b9631bd
started slots class

Nathan
authored and
Nathan
committed
ef99705
Merge pull request #4 from Casino-Royale/Dev
tnguyen1912
authored
b3eee43
edited GameInterface

Nathan
authored and
Nathan
committed
d23c2a2
started slots class

Nathan
authored and
Nathan
committed
e14aeb8
started slots class

Nathan
authored and
Nathan
committed
d937b7e
Edited GameInterface

Nathan
authored and
Nathan
committed
f080d9f
Merge pull request #5 from tnguyen1912/master
tnguyen1912
authored
0a35cc9
Merge pull request #6 from Casino-Royale/Dev
NicholasWolak
authored
28be7ba
Started BlackJack, needs a lot of reform
Nick
committed
0e6255e
please work
Nick
committed
d61b621
Completed Beetle.java and tests for Beetle.java

Zach
authored and
Zach
committed
b6997ba
Merge pull request #7 from ZachSinger/master
ZachSinger
authored
b89d734
Player.java ready

Dipinti
authored and
Dipinti
committed
6ddad3f
Have to reform cards, updating BlackJack
Nick
committed
76d125f
Merge pull request #9 from NicholasWolak/master
NicholasWolak
authored
5bfc4e9
Merge pull request #10 from Casino-Royale/master
NicholasWolak
authored
f8aa1c3
Merge pull request #8 from Dipinti3/Dev
NicholasWolak
authored
ab9b8d3
Merge branch 'Casino-Royale:master' into master
ZachSinger
authored
9280d16
Merge pull request #11 from Casino-Royale/Dev
ZachSinger
authored
879a3a1
Merge branch 'Casino-Royale:master' into master
ZachSinger
authored
8917f93
Ready 2 Merge

Zach
authored and
Zach
committed
bd973ac
Take this shit

Nathan
authored and
Nathan
committed
52b857a
Merge pull request #12 from tnguyen1912/master
tnguyen1912
authored
4bdcff2
Merge pull request #13 from ZachSinger/master
ZachSinger
authored
13c97cb
SLOTS SLOTS SLOTS

Nathan
authored and
Nathan
committed
151543f
21 21 21
Nick
committed
c920eee
Setting up my branch
Nick
committed
38df35b
fucking work
Nick
committed
4e0864f
what
Nick
committed
9c74036
Merge pull request #14 from Casino-Royale/Nick
NicholasWolak
authored
8c83e9b
pushin for the cushion
Nick
committed
079ecb1
plz
Nick
committed
372acde
Solved some problems

Nathan
authored and
Nathan
committed
698fc05
uhh
Nick
committed
13561fd
testing

Zach
authored and
Zach
committed
96fa77e
Edited BeetleGame

Nathan
authored and
Nathan
committed
c4d34c3
Merge branch 'master' into Dev
Jarryd Stamatelos
committed
fb947bd
feat(black-jack): update readme for example
Jarryd Stamatelos
committed
b7067a7
Merge pull request #15 from Casino-Royale/feat/black-jack
NicholasWolak
authored
114de0d
Dev (#16)

authored
c3a89cc

Commits on Jul 14, 2021

feat/black-jack update
Nick
committed
56a1db9
Merge pull request #17 from Casino-Royale/feat/black-jack
NicholasWolak
authored
030dcf7
pulling
Nick
committed
dbda690
g
Nick
committed
cde49a7
CasinoAccount and CasinoAccountManager.java (#19)

ZachSinger
and
Zach
authored
412c509
plinkogame and plinkotest done

Dipinti
authored and
Dipinti
committed
36b2994
Feature/casino account (#20)

ZachSinger
and
Zach
authored
215c282
Feature/casino account (#21)

ZachSinger
and
Zach
authored
a2018af
pulling (#22)

ZachSinger
and
Nick
authored
71abb54
plinko.java is ready

Dipinti
authored and
Dipinti
committed
5c51613
Feature/casino account (#23)

ZachSinger
and
Zach
authored
278a0ca
(feat:black-jack) game logic completed, need refinment and bet input
Nick
committed
248f47f
Merge pull request #25 from Casino-Royale/feat/plinko
Dipinti3
authored
6d3d1ac
Feature/slots (#24)

authored
eb43adc
CasinoAccountManager and Casino thru to game selection. Account logins successful

Zach
authored and
Zach
committed
ffc4938
attempting to fix issues with merge

Zach
authored and
Zach
committed
6a7d660
(feat:black-jack) game logic built, continuing on formatting
Nick
committed
9308a8f
Feature/casino account (#27)

ZachSinger
and
Zach
authored
321ff08
Merge branch 'Dev' into feat/black-jack
NicholasWolak
authored
041b9d6
Feat/black jack (#26)

NicholasWolak
and
Nick
authored
f60d282
commiting for merge
Nick
committed
d7b6482
dev merge
Nick
committed
5b2842e
(feat:black-jack) merging
Nick
committed
0623f4b
Merge pull request #28 from Casino-Royale/feat/black-jack
NicholasWolak
authored
d63da3d
added new comment in slots

Nathan
authored and
Nathan
committed
a867caf
Merge pull request #29 from Casino-Royale/feature/slotsGAME
tnguyen1912
authored
f3a12d5
Changed Double data type to Integer in Player class

Zach
authored and
Zach
committed
f751781
Merge pull request #31 from Casino-Royale/feature/player
NicholasWolak
authored
b997b84
(feat:black-jack) just to be safe
Nick
committed
e824278
Merge pull request #32 from Casino-Royale/feat/black-jack
NicholasWolak
authored
2a61307
Safety check
Nick
committed
4b6447f
Merge pull request #33 from Casino-Royale/feat/black-jack
NicholasWolak
authored
9506a0a
Updated player interface by removing run method, changed Double Integer on Beetle Game and BeetlePlayer

Zach
authored and
Zach
committed
800164e
finished getBetSelections

Nathan
authored and
Nathan
committed
895135d
Feature/beetle game (#34)

ZachSinger
and
Zach
authored
2f40239
updated plinko.java without override methods

Dipinti
authored and
Dipinti
committed
796b2c9
also updated the plinkotest without overrides

Dipinti
authored and
Dipinti
committed
f79717e
Merge branch 'Dev' into feat/plinko
NicholasWolak
authored
591d902
pre-pull
Nick
committed
e6c5995
pre pull pt2
Nick
committed
57493fc
Merge pull request #35 from Casino-Royale/feat/plinko
NicholasWolak
authored
6b1442f
working branch clean up
Nick
committed
25ea655
solid working branch for the the 14th
Nick
committed
4ea382c
Merge pull request #36 from Casino-Royale/feat/black-jack
NicholasWolak
authored
4fb6131
resolved conflicts with previous merge to Dev branch

Zach
authored and
Zach
committed
c351388
Merge branch 'Dev' of https://github.com/Casino-Royale/casino.maven

Dipinti
authored and
Dipinti
committed
34371b1
made more edits to slots game

Nathan
authored and
Nathan
committed
a98113f
new slots changes WITH updated player code

Nathan
authored and
Nathan
committed
9436624
Merge pull request #38 from Casino-Royale/feature/slotsGAME
tnguyen1912
authored
e1f867c
Pushing for pull
Nick
committed
e67c9dd
Merge pull request #39 from Casino-Royale/feat/black-jack
NicholasWolak
authored
09ceb31
Feature/beetle game test (#40)

ZachSinger
and
Zach
authored
4b68a1a
fixed unresolved/undetected merge issue in Player Class

Zach
authored and
Zach
committed
f93574c
(feat:black-jack) implementing 2 unique game conditions
Nick
committed
67a1a60
Merge pull request #41 from Casino-Royale/feat/black-jack
NicholasWolak
authored
273091b
keno game is ready

Dipinti
authored and
Dipinti
committed
287d5c7
Merge pull request #42 from Casino-Royale/feat/keno
Dipinti3
authored
98091c7
Everything works except player

Nathan
authored and
Nathan
committed
0d6499a
NumberGuessGame.java and NumberGuessGameTests.java submitted (#43)

ZachSinger
and
Zach
authored
d4f21a9
commit 620

Nathan
authored and
Nathan
committed
4bd4513
Merge pull request #44 from Casino-Royale/feature/slotsGAME
tnguyen1912
authored
3dda564
(feat:black-jack) cleaned the code
Nick
committed
22c31a7
Feature/number guessing (#45)

ZachSinger
and
Zach
authored
e84f109
new changes to slotsplayerclass

Nathan
authored and
Nathan
committed
cf46939
changes made to slotsGame line 178

Nathan
authored and
Nathan
committed
a2684bc
most updated and most functional at 733

Nathan
authored and
Nathan
committed
271f247
Merge pull request #46 from Casino-Royale/feature/slotsGAME
tnguyen1912
authored
4da5da2

Commits on Jul 15, 2021

(feat:black-jack) Logic: completed / Test:To be done
Nick
committed
b8a628a
Merge pull request #47 from Casino-Royale/feat/black-jack
NicholasWolak
authored
f68de19
Changed player class, slots fully functional

Nathan
authored and
Nathan
committed
e036e3b
Merge branch 'Dev' into feature/slotsGAME
NicholasWolak
authored
9bcd361
Merge pull request #48 from Casino-Royale/feature/slotsGAME
NicholasWolak
authored
43ea867
prepull
Nick
committed
12143a6
prepull
Nick
committed
7ebfc4d
(feat:black-jack) implemented betting
Nick
committed
d397cec
Linked BlackJack and Beetle instantiation

Zach
authored and
Zach
committed
4a87167
Merge pull request #49 from Casino-Royale/feat/black-jack
NicholasWolak
authored
43225f3
Working on IO for BeetleGame.java and routed Beetle through Casino so user can access game (#50)

ZachSinger
and
Zach
authored
13f6048
edited numberguessgame

Nathan
authored and
Nathan
committed
2a9c2e9
(feat:black-jack) slight loop issue, see comments
Nick
committed
a587568
(feat:black-jack) added comments to polish
Nick
committed
16545d8
Merge pull request #51 from Casino-Royale/feat/black-jack
NicholasWolak
authored
68792f6
Added IO for Beetle.java, added input controls and betting. Next update to include winnings calculations

Zach
authored and
Zach
committed
19ac039
many new codes in numberGuessGame

Nathan
authored and
Nathan
committed
c5ddee5
new commit 101

Nathan
authored and
Nathan
committed
69c8ec4
Latest commit at 107

Nathan
authored and
Nathan
committed
2cc5174
Merge pull request #52 from Casino-Royale/feature/slotsGAME
tnguyen1912
authored
07628b6
pre finish changes (#53)

ZachSinger
and
Zach
authored
58542c3
new plinko game is ready

Dipinti
authored and
Dipinti
committed
579f022
new keno game is ready

Dipinti
authored and
Dipinti
committed
902b078
Final payout information and new line formatting/spacing implemented for BeetleGame

Zach
authored and
Zach
committed
430bd89
trying to merge plinko and keno games

Dipinti
authored and
Dipinti
committed
f8f11f3
newLine error fixed in Beetle

Zach
authored and
Zach
committed
00ad0fa
after conflicts resolved
Nick
committed
54ed51e
Merge pull request #55 from Casino-Royale/feature/DipintiKeno
NicholasWolak
authored
7e317e0
Added CSVUtils class, next feature will be implementation so user can access through console instead of creating new account (#56)

ZachSinger
and
Zach
authored
00224c4
switching to new branch after adding options for saving/loading

Zach
authored and
Zach
committed
7692730
(feat:black-jack) fixed the death loop
Nick
committed
f65c2c7
CSV loader and saver workinggit add -u (#57)

ZachSinger
and
Zach
authored
cd5f41b
(feat:black-jack) functionality complete, polishing formatting
Nick
committed
cc93126
Merge pull request #58 from Casino-Royale/feat/black-jack
NicholasWolak
authored
da4e8d4
added test files

Dipinti
authored and
Dipinti
committed
088d9cd
Merge branch 'Dev' into feature/DipintiTestFiles
NicholasWolak
authored
4671932