144 Commits (2895dccc44f589fbae5dec1d9f6a5e28a8852974)
 

Author SHA1 Message Date
  Jonathan Hinds a30590db31 settled conflicts with stud 6 years ago
  jonathan-hinds 5c19f95d05 Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud 6 years ago
  Nick Satinover d083901e7e merge stud with working 6 years ago
  Simran Bhutani 10be3833c4 merged with working 6 years ago
  Simran Bhutani e54aa66f4b about to merge with working 6 years ago
  Jonathan Hinds 56531a60c6 minor changes during discussion with lauren 6 years ago
  Lauren Green fc8e5164c7 Fix merge conflicts 6 years ago
  Lauren Green e725de739e Changes 6 years ago
  Jonathan Hinds 90823ff7d2 minor fixes after meging war with working 6 years ago
  Jonathan Hinds 731fd0d957 resolved conflicts afer meging war and working 6 years ago
  Jonathan Hinds d8a9e8abcb update console with nextline instead of next 6 years ago
  Lauren Green a356217157 Last update 6 years ago
  jonathan-hinds 63e3a9df0e Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working 6 years ago
  Lauren Green b20be8d9fe Made it so you can play another game 6 years ago
  Lauren Green 7cb86fab6b Added a return to console 6 years ago
  Jonathan Hinds dfd5d65943 completed war method 6 years ago
  Lauren Green 5739ee8450 Fixed so that three of a kind could take a four of a kind and a yahtzee 6 years ago
  Lauren Green 7fc8ebfa05 Changed payout amount 6 years ago
  Lauren Green da2e13d230 Caught a mistake in reRoll, all set now 6 years ago
  Simran Bhutani 9a4e371ddb slots 6 years ago
  Lauren Green bb485916b1 Merge branch 'yahtzee' 6 years ago
  Lauren Green 31ce2bd649 Small Updates 6 years ago
  jonathan-hinds 2d43898c18 Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud 6 years ago
  Nick Satinover 6aa4fcd19c merge war w/ stud 6 years ago
  Lauren Green fad12e2658 Small tweaks 6 years ago
  Nick Satinover ecd1604823 merge for war card win method 6 years ago
  Jonathan Hinds 47a6851247 war finished - except for war method 6 years ago
  Lauren Green fa602a597f Yahtzee working. Bugs seem to be all worked out. Need a return to console at end. 6 years ago
  Simran Bhutani c8aa611c5f create slots branch 6 years ago
  Lauren Green 769ef57166 Yahtzee class written 6 years ago
  Nick Satinover 111e479ad6 merged stud with war - new CardGame methods 6 years ago
  Nick Satinover ae1192b5a7 about to merge with war 6 years ago
  Jonathan Hinds 6b9d5f30a3 Modified CardGame class to have chooseStartingPlayer and chooseNextPlayer 6 years ago
  Lauren Green dcff23698e Saving user input updates for Yahtzee and ScoreSheet 6 years ago
  Jonathan Hinds 2050633888 modified deck class, updated war 6 years ago
  Jonathan Hinds 1333ced222 working on war 6 years ago
  Nick Satinover 16a856de63 stud branch created 6 years ago
  Jonathan Hinds 777f19ed25 Merge branch 'master' into working 6 years ago
  Jonathan Hinds d474d1b6e5 merged jonDev with master 6 years ago
  jonathan-hinds 15b68cedaa Merge branch 'master' of laurengreen/ZCW-OOP-Casino into master 6 years ago
  Jonathan Hinds 57ab00ead5 Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into jonDev 6 years ago
  Lauren Green a0b6fccd47 Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino 6 years ago
  Lauren Green 53bbc5fdf1 Added check if row was already filled 6 years ago
  Jonathan Hinds 0304cb88e4 please save 6 years ago
  Jonathan Hinds a1d9a6616d reviewing yahtzee / scoresheet with team 6 years ago
  Jonathan Hinds f3576edd32 reviewing yahtzee / scoresheet with team 6 years ago
  Jonathan Hinds 2acf293bd0 Last nights changes - double checking 6 years ago
  jonathan-hinds eaeac3795b Merge branch 'master' of laurengreen/ZCW-OOP-Casino into master 6 years ago
  Lauren Green 12576f7c77 Started adding to Yahtzee 6 years ago
  Lauren Green 65214b596b Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino 6 years ago