Lauren Green
|
5ad9fba823
|
Started changing print methods
|
il y a 6 ans |
Lauren Green
|
b8145f0eb7
|
backup
|
il y a 6 ans |
Lauren Green
|
793fdffa7c
|
Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino
|
il y a 6 ans |
jonathan-hinds
|
50dfc292d8
|
Merge branch 'slots' of sambhutani/ZCW-OOP-Casino into working
|
il y a 6 ans |
Simran Bhutani
|
03e318a12a
|
Merge
|
il y a 6 ans |
Simran Bhutani
|
ed58911dfc
|
added slot
|
il y a 6 ans |
Lauren Green
|
3a05c3df60
|
merging
|
il y a 6 ans |
Lauren Green
|
0262b67df4
|
merging
|
il y a 6 ans |
Lauren Green
|
e0f20421f2
|
Backup
|
il y a 6 ans |
Jonathan Hinds
|
f4be1dfe44
|
Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into working
|
il y a 6 ans |
Jonathan Hinds
|
e13559aa6a
|
removed ignored files
|
il y a 6 ans |
Jonathan Hinds
|
de29fb53db
|
updated wartest
|
il y a 6 ans |
jonathan-hinds
|
934a8ecaca
|
Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working
|
il y a 6 ans |
Lauren Green
|
319ab8366d
|
More tests written
|
il y a 6 ans |
Lauren Green
|
45bffd0093
|
Fix merge conflict
|
il y a 6 ans |
Lauren Green
|
a65a443b70
|
Backing up changes
|
il y a 6 ans |
Jonathan Hinds
|
a30590db31
|
settled conflicts with stud
|
il y a 6 ans |
jonathan-hinds
|
5c19f95d05
|
Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud
|
il y a 6 ans |
Nick Satinover
|
d083901e7e
|
merge stud with working
|
il y a 6 ans |
Simran Bhutani
|
10be3833c4
|
merged with working
|
il y a 6 ans |
Simran Bhutani
|
e54aa66f4b
|
about to merge with working
|
il y a 6 ans |
Jonathan Hinds
|
56531a60c6
|
minor changes during discussion with lauren
|
il y a 6 ans |
Lauren Green
|
fc8e5164c7
|
Fix merge conflicts
|
il y a 6 ans |
Lauren Green
|
e725de739e
|
Changes
|
il y a 6 ans |
Jonathan Hinds
|
90823ff7d2
|
minor fixes after meging war with working
|
il y a 6 ans |
Jonathan Hinds
|
731fd0d957
|
resolved conflicts afer meging war and working
|
il y a 6 ans |
Jonathan Hinds
|
d8a9e8abcb
|
update console with nextline instead of next
|
il y a 6 ans |
Lauren Green
|
a356217157
|
Last update
|
il y a 6 ans |
jonathan-hinds
|
63e3a9df0e
|
Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working
|
il y a 6 ans |
Lauren Green
|
b20be8d9fe
|
Made it so you can play another game
|
il y a 6 ans |
Lauren Green
|
7cb86fab6b
|
Added a return to console
|
il y a 6 ans |
Jonathan Hinds
|
dfd5d65943
|
completed war method
|
il y a 6 ans |
Lauren Green
|
5739ee8450
|
Fixed so that three of a kind could take a four of a kind and a yahtzee
|
il y a 6 ans |
Lauren Green
|
7fc8ebfa05
|
Changed payout amount
|
il y a 6 ans |
Lauren Green
|
da2e13d230
|
Caught a mistake in reRoll, all set now
|
il y a 6 ans |
Simran Bhutani
|
9a4e371ddb
|
slots
|
il y a 6 ans |
Lauren Green
|
bb485916b1
|
Merge branch 'yahtzee'
|
il y a 6 ans |
Lauren Green
|
31ce2bd649
|
Small Updates
|
il y a 6 ans |
jonathan-hinds
|
2d43898c18
|
Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud
|
il y a 6 ans |
Nick Satinover
|
6aa4fcd19c
|
merge war w/ stud
|
il y a 6 ans |
Lauren Green
|
fad12e2658
|
Small tweaks
|
il y a 6 ans |
Nick Satinover
|
ecd1604823
|
merge for war card win method
|
il y a 6 ans |
Jonathan Hinds
|
47a6851247
|
war finished - except for war method
|
il y a 6 ans |
Lauren Green
|
fa602a597f
|
Yahtzee working. Bugs seem to be all worked out. Need a return to console at end.
|
il y a 6 ans |
Simran Bhutani
|
c8aa611c5f
|
create slots branch
|
il y a 6 ans |
Lauren Green
|
769ef57166
|
Yahtzee class written
|
il y a 6 ans |
Nick Satinover
|
111e479ad6
|
merged stud with war - new CardGame methods
|
il y a 6 ans |
Nick Satinover
|
ae1192b5a7
|
about to merge with war
|
il y a 6 ans |
Jonathan Hinds
|
6b9d5f30a3
|
Modified CardGame class to have chooseStartingPlayer and chooseNextPlayer
|
il y a 6 ans |
Lauren Green
|
dcff23698e
|
Saving user input updates for Yahtzee and ScoreSheet
|
il y a 6 ans |