82 Révisions (10be3833c44b0494fb48136669744a1e385107b7)

 

Toutes les branches   

Chercher

Auteur	SHA1	Message	Date
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
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
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
Lauren Green	fad12e2658	Small tweaks	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
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
Jonathan Hinds	2050633888	modified deck class, updated war	il y a 6 ans
Jonathan Hinds	1333ced222	working on war	il y a 6 ans
Jonathan Hinds	777f19ed25	Merge branch 'master' into working	il y a 6 ans
Jonathan Hinds	d474d1b6e5	merged jonDev with master	il y a 6 ans
jonathan-hinds	15b68cedaa	Merge branch 'master' of laurengreen/ZCW-OOP-Casino into master	il y a 6 ans
Jonathan Hinds	57ab00ead5	Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into jonDev	il y a 6 ans
Lauren Green	a0b6fccd47	Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino	il y a 6 ans
Lauren Green	53bbc5fdf1	Added check if row was already filled	il y a 6 ans
Jonathan Hinds	0304cb88e4	please save	il y a 6 ans
Jonathan Hinds	a1d9a6616d	reviewing yahtzee / scoresheet with team	il y a 6 ans
Jonathan Hinds	f3576edd32	reviewing yahtzee / scoresheet with team	il y a 6 ans
Jonathan Hinds	2acf293bd0	Last nights changes - double checking	il y a 6 ans
jonathan-hinds	eaeac3795b	Merge branch 'master' of laurengreen/ZCW-OOP-Casino into master	il y a 6 ans
Lauren Green	12576f7c77	Started adding to Yahtzee	il y a 6 ans
Lauren Green	65214b596b	Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino	il y a 6 ans
Lauren Green	0d31d9762d	ScoreSheet complete with tests other than ones where I need a Dice[]	il y a 6 ans
Lauren Green	0dc1ff654c	ScoreSheet complete with tests other than ones where I need a Dice[]	il y a 6 ans
Jonathan Hinds	1374dd648f	taking minBet and maxBet from the constructor of the CardGame class	il y a 6 ans
Lauren Green	a267ac345e	Most methods written for ScoreSheet	il y a 6 ans
Jonathan Hinds	f393813214	pseudo code for startround in war	il y a 6 ans
Jonathan Hinds	5aa441ffd0	setup playcard and war method	il y a 6 ans
Jonathan Hinds	9a4c603e75	added ante	il y a 6 ans
jonathan-hinds	3ec34d2991	Merge branch 'master' of nsatinover/ZCW-OOP-Casino into master	il y a 6 ans
Jonathan Hinds	fd7210b6ca	Merged Joses dice changes	il y a 6 ans
Jonathan Hinds	0d66fd62ff	test	il y a 6 ans
jonathan-hinds	baedbdcb59	Merge branch 'master' of jbedolla40/ZCW-OOP-Casino into master	il y a 6 ans
Jose Bedolla	e141ab5407	merge conflict resolved	il y a 6 ans