Simran Bhutani
|
fa1f81dade
|
resolved conflicts with slot tests
|
6 vuotta sitten |
Simran Bhutani
|
dc27e3532d
|
merge all sim changes
|
6 vuotta sitten |
jonathan-hinds
|
118feb5d22
|
Merge branch 'working' of sambhutani/ZCW-OOP-Casino into working
|
6 vuotta sitten |
Simran Bhutani
|
ba9adc0d90
|
pushing to slots
|
6 vuotta sitten |
jonathan-hinds
|
a7f3d5d09a
|
Merge branch 'newstud' of nsatinover/ZCW-OOP-Casino into working
|
6 vuotta sitten |
Nick Satinover
|
5185ec0e24
|
conflicts resolved
|
6 vuotta sitten |
Nick Satinover
|
adf978786d
|
Merge branch 'working' of https://git.zipcode.rocks/nsatinover/ZCW-OOP-Casino into newstud
|
6 vuotta sitten |
Jonathan Hinds
|
9d0d2b76cd
|
tests for printer and war
|
6 vuotta sitten |
Nick Satinover
|
60c21f392d
|
68% test coverage for stud
|
6 vuotta sitten |
Nick Satinover
|
450b13f21a
|
stud at 45%
|
6 vuotta sitten |
jonathan-hinds
|
729c8cb79c
|
Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working
|
6 vuotta sitten |
Lauren Green
|
ce3c6d1b31
|
Merge
|
6 vuotta sitten |
Lauren Green
|
77f16514bf
|
Final tests added
|
6 vuotta sitten |
Lauren Green
|
900126e38f
|
Tests written for Yahtzee Class
|
6 vuotta sitten |
Lauren Green
|
ccde6ad58e
|
Yahtzee test progress
|
6 vuotta sitten |
Jonathan Hinds
|
1ac18e24c2
|
removed quit
|
6 vuotta sitten |
Nick Satinover
|
4059d819d3
|
New working stud with betting removed, working test methods
|
6 vuotta sitten |
Jonathan Hinds
|
ec82737a85
|
refactored war
|
6 vuotta sitten |
Lauren Green
|
0cd8416b06
|
DicePlayer class no more print statements
|
6 vuotta sitten |
Lauren Green
|
d3f172776f
|
Scoresheet Tests
|
6 vuotta sitten |
Lauren Green
|
88f8441dc0
|
Changes in scoresheet to simplify code and remove printing
|
6 vuotta sitten |
Jonathan Hinds
|
4c82f9a3d6
|
corrected printer class
|
6 vuotta sitten |
Lauren Green
|
b19bd089ac
|
Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino
|
6 vuotta sitten |
Lauren Green
|
5ad9fba823
|
Started changing print methods
|
6 vuotta sitten |
Jonathan Hinds
|
c368a19d71
|
seperated casino and console
|
6 vuotta sitten |
Lauren Green
|
b8145f0eb7
|
backup
|
6 vuotta sitten |
Lauren Green
|
793fdffa7c
|
Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino
|
6 vuotta sitten |
jonathan-hinds
|
50dfc292d8
|
Merge branch 'slots' of sambhutani/ZCW-OOP-Casino into working
|
6 vuotta sitten |
Simran Bhutani
|
03e318a12a
|
Merge
|
6 vuotta sitten |
Simran Bhutani
|
ed58911dfc
|
added slot
|
6 vuotta sitten |
Lauren Green
|
3a05c3df60
|
merging
|
6 vuotta sitten |
Lauren Green
|
0262b67df4
|
merging
|
6 vuotta sitten |
Lauren Green
|
e0f20421f2
|
Backup
|
6 vuotta sitten |
Jonathan Hinds
|
f4be1dfe44
|
Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into working
|
6 vuotta sitten |
Jonathan Hinds
|
e13559aa6a
|
removed ignored files
|
6 vuotta sitten |
Jonathan Hinds
|
de29fb53db
|
updated wartest
|
6 vuotta sitten |
jonathan-hinds
|
934a8ecaca
|
Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working
|
6 vuotta sitten |
Lauren Green
|
319ab8366d
|
More tests written
|
6 vuotta sitten |
Lauren Green
|
45bffd0093
|
Fix merge conflict
|
6 vuotta sitten |
Lauren Green
|
a65a443b70
|
Backing up changes
|
6 vuotta sitten |
Jonathan Hinds
|
a30590db31
|
settled conflicts with stud
|
6 vuotta sitten |
jonathan-hinds
|
5c19f95d05
|
Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud
|
6 vuotta sitten |
Nick Satinover
|
d083901e7e
|
merge stud with working
|
6 vuotta sitten |
Simran Bhutani
|
10be3833c4
|
merged with working
|
6 vuotta sitten |
Simran Bhutani
|
e54aa66f4b
|
about to merge with working
|
6 vuotta sitten |
Jonathan Hinds
|
56531a60c6
|
minor changes during discussion with lauren
|
6 vuotta sitten |
Lauren Green
|
fc8e5164c7
|
Fix merge conflicts
|
6 vuotta sitten |
Lauren Green
|
e725de739e
|
Changes
|
6 vuotta sitten |
Jonathan Hinds
|
90823ff7d2
|
minor fixes after meging war with working
|
6 vuotta sitten |
Jonathan Hinds
|
731fd0d957
|
resolved conflicts afer meging war and working
|
6 vuotta sitten |