Dev#12

Open

k-law21 wants to merge 359 commits intoZipCodeCore:masterfrom jeanvalentin51:dev

+2,386-4

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 5, 2019

minor changes
jeanvalentin51
committed
getting the latest
jeanvalentin51
committed
commented out cardhand
MannyMonocle
committed
rolling
MannyMonocle
committed
Merge pull request #27 from jeanvalentin51/player
jeanvalentin51
authored
latest
jeanvalentin51
committed
cardhand public
MannyMonocle
committed
Update
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
gofish changes
mikescho1
committed
refine
jeanvalentin51
committed
Merge pull request #28 from jeanvalentin51/console
jeanvalentin51
authored
pulling from dev
mikescho1
committed
oh yea
MannyMonocle
committed
Added DiceRolleTest
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Updating Yahtzee
MikeGray31
committed
saved gofish
mikescho1
committed
Added DiceRollTests and other Updates
MikeGray31
committed
Merge pull request #29 from jeanvalentin51/gofish
mikescho1
authored
Changes to craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
teamwork = dreamwork
MannyMonocle
committed
Merge branch 'dev' into yatzee
jeanvalentin51
authored
Merge pull request #30 from jeanvalentin51/yatzee
jeanvalentin51
authored
dice things
MannyMonocle
committed
Bug fixes for Yahtzee Class and more DiceRollTests
MikeGray31
committed
worked w/ Mike
MannyMonocle
committed
Merge pull request #31 from jeanvalentin51/player
jeanvalentin51
authored
Quality improvement to the display in Yahtzee
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
craps update

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
minor tweaks
MannyMonocle
committed
added numerous methods for blackjack
mikescho1
committed
changes on go fish

Maira Botelho
authored and
Maira Botelho
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
fixed conflicts
mikescho1
committed
Merge pull request #32 from jeanvalentin51/craps
jeanvalentin51
authored
new changes on go fish

Maira Botelho
authored and
Maira Botelho
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
add argument
jeanvalentin51
committed
Merge pull request #33 from jeanvalentin51/console
jeanvalentin51
authored

Commits on Nov 6, 2019

player wageGood added
MannyMonocle
committed
7pm
MannyMonocle
committed
Merge pull request #34 from jeanvalentin51/player
jeanvalentin51
authored
Update
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
add bj caluclator with alumni ben
mikescho1
committed
Merge pull request #35 from jeanvalentin51/gofish
jeanvalentin51
authored
undid changesclear
MannyMonocle
committed
uhhh
MannyMonocle
committed
7:21pm
MannyMonocle
committed
Merge pull request #36 from jeanvalentin51/player
jeanvalentin51
authored
minor changes to hand calculator
mikescho1
committed
pulling changes from dev
mikescho1
committed
changes on go fish

Maira Botelho
authored and
Maira Botelho
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #37 from jeanvalentin51/gofish
jeanvalentin51
authored
no major changes
mikescho1
committed
started on check for ace methds
mikescho1
committed
9am
MannyMonocle
committed
Merge branch 'dev' into player
MannyMonocle
committed
privated and protected some stuff
MannyMonocle
committed
Merge pull request #38 from jeanvalentin51/player
jeanvalentin51
authored
Fixed error coming from switch statements
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
changes to craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
changes to checkforacesmethod
mikescho1
committed
Merge branch 'dev' into blackjack
jeanvalentin51
authored
Merge pull request #39 from jeanvalentin51/blackjack
jeanvalentin51
authored
to pull
MannyMonocle
committed
Merge branch 'dev' into craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into player
MannyMonocle
committed
refine user experience
jeanvalentin51
committed
More bug fixes for Yahtzee
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Merge branch 'dev' into console
jeanvalentin51
committed
finished completing ace value logic
mikescho1
committed
Merge branch 'blackjack' of https://github.com/jeanvalentin51/Maven.Casino into blackjack
mikescho1
committed
Merge pull request #40 from jeanvalentin51/console
jeanvalentin51
authored
pulling most recent dev
mikescho1
committed
Merge pull request #41 from jeanvalentin51/blackjack
jeanvalentin51
authored
Add test for deal cards
jeanvalentin51
committed
craps almost done

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
Add test for shuffle deck
jeanvalentin51
committed
Merge pull request #42 from jeanvalentin51/craps
jeanvalentin51
authored
minor tweaks
MannyMonocle
committed
Merge branch 'dev' into player
MannyMonocle
committed
Updated Yahtzee Evalution methods and Tests to be more concise
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Updated Yahtzee Tests to have private fields
MikeGray31
committed
more changes on go fish

Maira Botelho
authored and
Maira Botelho
committed
Add logic to test draw card
jeanvalentin51
committed
Merge branch 'dev' into console
jeanvalentin51
committed
GoFish

Maira Botelho
authored and
Maira Botelho
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #44 from jeanvalentin51/gofish
jeanvalentin51
authored
pushing minor changes in order to pull from dev
mikescho1
committed
Updated Yahtzee
MikeGray31
committed
Updated Yahtzee
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
fix cardHand

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #45 from jeanvalentin51/yatzee
jeanvalentin51
authored
Merge pull request #46 from jeanvalentin51/gofish
jeanvalentin51
authored
minor changes to pull from dev
mikescho1
committed
pulling changes to cardhand from dev
mikescho1
committed
Cleaned up the code
jeanvalentin51
committed
fix conflict
jeanvalentin51
committed
Merge pull request #43 from jeanvalentin51/console
jeanvalentin51
authored
Add logic/test to add money
jeanvalentin51
committed
Merge pull request #47 from jeanvalentin51/console
jeanvalentin51
authored
minor
jeanvalentin51
committed
Merge pull request #48 from jeanvalentin51/console
jeanvalentin51
authored
update
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Add test for card hand
jeanvalentin51
committed
Add test for display hand
jeanvalentin51
committed
Merge branch 'dev' into console
jeanvalentin51
committed
Merge pull request #49 from jeanvalentin51/console
jeanvalentin51
authored
Merge branch 'dev' into yatzee
MikeGray31
committed
beautify
jeanvalentin51
committed
all that jazz
mikescho1
committed
Merge pull request #50 from jeanvalentin51/console
jeanvalentin51
authored
gettin jazz
mikescho1
committed
trying to resolve merge conflict
MannyMonocle
committed
fixed conflict
MannyMonocle
committed
jazz
jeanvalentin51
committed
Merge branch 'dev' into console
jeanvalentin51
committed
Merge pull request #51 from jeanvalentin51/console
jeanvalentin51
authored
blank yatzee
MannyMonocle
committed
fixed stuff
MannyMonocle
committed
nuked repo
MannyMonocle
committed
idk what's going on
MannyMonocle
committed
more user friendly stuff
jeanvalentin51
committed
Merge pull request #52 from jeanvalentin51/console
jeanvalentin51
authored
Added dice art
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Update
MikeGray31
committed
Update
MikeGray31
committed
added get balance method
MannyMonocle
committed
Merge branch 'dev' of https://github.com/jeanvalentin51/Maven.Casino into dev
MannyMonocle
committed
Merge branch 'dev' into player
MannyMonocle
committed
Merge pull request #53 from jeanvalentin51/player
jeanvalentin51
authored
update
MikeGray31
committed
Merge pull request #54 from jeanvalentin51/yatzee
jeanvalentin51
authored
console craps update

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
changes diaplay go fish

Maira Botelho
authored and
Maira Botelho
committed
fixes

Maira Botelho
authored and
Maira Botelho
committed
working on calculate hand methods
mikescho1
committed
Merge pull request #55 from jeanvalentin51/gofish
jeanvalentin51
authored
Craps is Done

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge branch 'dev' into craps

Kwamè Warrick
authored and
Kwamè Warrick
committed
Merge pull request #56 from jeanvalentin51/craps
jeanvalentin51
authored
fix menu for craps
jeanvalentin51
committed
Merge pull request #57 from jeanvalentin51/console
jeanvalentin51
authored
Updated ASCII art for Yahtzee Class
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Updated ASCII art for Yahtzee Class
MikeGray31
committed
go fish almost finished

Maira Botelho
authored and
Maira Botelho
committed
fixed merge

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #58 from jeanvalentin51/gofish
jeanvalentin51
authored
jazz
jeanvalentin51
committed
Merge pull request #59 from jeanvalentin51/console
jeanvalentin51
authored

Commits on Nov 7, 2019

Updated ASCII art for Yatzee Class
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Add test for have card
jeanvalentin51
committed
Updated ASCII art for Yatzee Class
MikeGray31
committed
More ASCII art updates for Yahtzee and added resetGame() method
MikeGray31
committed
Merge pull request #60 from jeanvalentin51/yatzee
jeanvalentin51
authored
Add test for trade cards
jeanvalentin51
committed
update
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
update
MikeGray31
committed
lots of stuff. who know what
mikescho1
committed
Add test for fish for card
jeanvalentin51
committed
Merge branch 'dev' into console
jeanvalentin51
committed
Merge pull request #61 from jeanvalentin51/console
jeanvalentin51
authored
Add test for check winner
jeanvalentin51
committed
Created YahtzeeDiceTest and ScoreAndSettingsTest classes
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Add test for get comp card
jeanvalentin51
committed
Merge branch 'dev' into console
jeanvalentin51
committed
Merge pull request #62 from jeanvalentin51/console
jeanvalentin51
authored
Merge branch 'dev' into blackjack
jeanvalentin51
authored
Merge pull request #63 from jeanvalentin51/blackjack
jeanvalentin51
authored
Clear the screen more
jeanvalentin51
committed
Merge pull request #64 from jeanvalentin51/console
jeanvalentin51
authored
clean up
MannyMonocle
committed
small changes, jazzie changes

Maira Botelho
authored and
Maira Botelho
committed
lower case for Valentin

Maira Botelho
authored and
Maira Botelho
committed
Merge branch 'dev' of https://github.com/jeanvalentin51/Maven.Casino into dev

Maira Botelho
authored and
Maira Botelho
committed
go fish

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #65 from jeanvalentin51/gofish
jeanvalentin51
authored
Merge pull request #66 from jeanvalentin51/yatzee
jeanvalentin51
authored
Merge branch 'dev' into player
MannyMonocle
committed
added resetpot
MannyMonocle
committed
stuff
MannyMonocle
committed
Merge pull request #67 from jeanvalentin51/player
jeanvalentin51
authored
finished go fish

Maira Botelho
authored and
Maira Botelho
committed
Merge branch 'dev' into gofish

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #68 from jeanvalentin51/gofish
jeanvalentin51
authored
console fixed
MannyMonocle
committed
more string changes
MannyMonocle
committed
Merge branch 'dev' into player
MannyMonocle
committed
checkForChips added
MannyMonocle
committed
working on bj
jeanvalentin51
committed
Merge branch 'dev' into console
jeanvalentin51
committed
Merge pull request #69 from jeanvalentin51/player
jeanvalentin51
authored
Merge branch 'dev' into console
jeanvalentin51
committed
logic added
MannyMonocle
committed
more logic
jeanvalentin51
committed
Merge branch 'dev' into player
MannyMonocle
committed
cleanup
MannyMonocle
committed
Merge branch 'dev' into yatzee
MikeGray31
committed

Commits on Nov 8, 2019

not crashing but need more logic
jeanvalentin51
committed
Merge pull request #70 from jeanvalentin51/console
jeanvalentin51
authored
craps tests added
MannyMonocle
committed
merge conflict fixed
MannyMonocle
committed
Merge pull request #71 from jeanvalentin51/player
jeanvalentin51
authored
Merge branch 'dev' into yatzee
MikeGray31
committed
fri 9am
MannyMonocle
committed
Merge branch 'dev' into player
MannyMonocle
committed
repaired craps
MannyMonocle
committed
fixed tests
jeanvalentin51
committed
Merge pull request #72 from jeanvalentin51/console
jeanvalentin51
authored
CardHand test fixed

Maira Botelho
authored and
Maira Botelho
committed
erge conflicts

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #73 from jeanvalentin51/gofish
jeanvalentin51
authored
Merge branch 'dev' into player
MannyMonocle
committed
beautify
jeanvalentin51
committed
Merge pull request #74 from jeanvalentin51/console
jeanvalentin51
authored
Merge pull request #75 from jeanvalentin51/player
jeanvalentin51
authored
final merge
MannyMonocle
committed
Working on Blackjack
MikeGray31
committed
Merge branch 'dev' into player
MannyMonocle
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Merge pull request #76 from jeanvalentin51/player
jeanvalentin51
authored
remove test for user input
jeanvalentin51
committed
Merge pull request #77 from jeanvalentin51/console
jeanvalentin51
authored
s

Maira Botelho
authored and
Maira Botelho
committed
Merge pull request #78 from jeanvalentin51/gofish
jeanvalentin51
authored
Updated Blackjack
MikeGray31
committed
Merge branch 'dev' into yatzee
MikeGray31
committed
Merge pull request #79 from jeanvalentin51/yatzee
jeanvalentin51
authored