sambhutani
/
ZCW-OOP-Casino1
изданак од Cohort4.2/ZCW-OOP-Casino
Прати 1
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity

Commit graph

  • *
  • *
  • |\
  • * |
  • | *
  • | |\
  • | * |
  • | | *
  • | | *
  • | * |
  • | |\ \
  • | | |/
  • | |/|
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | | *
  • | * |
  • | |\ \
  • | | * \
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | * | |
  • * | | |
  • |\ \ \ \
  • | |/ / /
  • * | | |
  • | | | *
  • | | * |
  • | | * |
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | | * |
  • | * | |
  • | |\ \ \
  • | * | | |
  • | | * | |
  • | | |\ \ \
  • | | | * \ \
  • | | | |\ \ \
  • | | | |/ / /
  • | | |/| | |
  • | | | * | |
  • | * | | | |
  • | |\ \ \ \ \
  • | | |/ / / /
  • | * | | | |
  • | | * | | |
  • | | |\ \ \ \
  • | |/ / / / /
  • | | | _ / /
  • | | | / /
  • | | * | |
  • | * | | |
  • | |\ \ \ \
  • | | | |_|/
  • | | |/| |
  • | | * | |
  • | | |\ \ \
  • | | |/ / /
  • | |/| | |
  • | | * | |
  • | | |\ \ \
  • | | | | | *
  • | | | | | |\
  • | | |_|_|_|/
  • | |/| | | |
  • | | | | | *
  • | * | | | |
  • | | |_|_|/
  • | |/| | |
  • | | * | |
  • | | * | |
  • | * | | |
  • | |\ \ \ \
  • | | * \ \ \
  • | | |\ \ \ \
  • | | |/ / / /
  • | |/| | | |
  • | | * | | |
  • | | * | | |
  • | | * | | |
  • | * | | | |
  • | | |_|_|/
  • | |/| | |
  • | | | * |
  • | * | | |
  • | | |/ /
  • | |/| |
  • | | * |
  • | | * |
  • | | * |
  • | * | |
  • | | * |
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | | * |
  • | * | |
  • | | * |
  • | | * |
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | * | |
  • | |\ \ \
  • | | * \ \
  • | | |\ \ \
  • | | |/ / /
  • | |/| | |
  • | | * | |
  • | | | * |
  • | | | * |
  • | | | |\ \
  • | | |_|/ /
  • | |/| | |
  • | | | * |
  • | * | | |
  • | |\ \ \ \
  • | * | | | |
  • | * | | | |
  • | | * | | |
  • | | |\ \ \ \
  • | |/ / / / /
  • | | | | _ /
  • | | | | /
  • | | * | |
  • | | * | |
  • | | |\ \ \
  • | | |/ / /
  • | |/| | |
  • | | * | |
  • | * | | |
  • | |\ \ \ \
  • | | * \ \ \
  • | | |\ \ \ \
  • | | | * | | |
  • | | | | | * |
  • | | | | | |\ \
  • | | |_|_|_|/ /
  • | |/| | | | |
  • | | | | | * |
  • | | | | | |\ \
  • | * | | | | | |
  • | | | | * | | |
  • | | | | |\ \ \ \
  • | | |_|_|/ / / /
  • | |/| | | | | |
  • | | | | * | | |
  • | * | | | | | |
  • | * | | | | | |
  • | |\ \ \ \ \ \ \
  • | * | | | | | | |
  • | | | | | * | | |
  • | * | | | | | | |
  • | |\ \ \ \ \ \ \ \
  • | | | |_|_|/ / / /
  • | | |/| | | | | |
  • | | * | | | | | |
  • | | * | | | | | |
  • | | | * | | | | |
  • | | * | | | | | |
  • | | * | | | | | |
  • | | * | | | | | |
  • | | | | | | * | |
  • | | * | | | | | |
  • | | |\ \ \ \ \ \ \
  • | | | * | | | | | |
  • | | | | | * | | | |
  • | | | | | |\ \ \ \ \
  • | | |_|_|/ / / / / /
  • | |/| | | | / / / /
  • | | | | | |/ / / /
  • | | | | | * | | |
  • | | | | | |\ \ \ \
  • | | | | | |/ / / /
  • | | | | |/| | | |
  • | | * | | | | | |
  • | | |/ / / / / /
  • | | | | * | | |
  • | | | * | | | |
  • | | | | |_|/ /
  • | | | |/| | |
  • | | * | | | |
  • | | | | | * |
  • | |_|_|_|/ /
  • |/| | | | |
  • | | * | | |
  • | | | | * |
  • | | | | |\ \
  • | | | | |/ /
  • | | | |/| |
  • | | | | * |
  • | | | * | |
  • | | | |/ /
  • | | * | |
  • | |/ / /
  • de46abe (HEAD -> master) casino by Simran Bhutani 2018-11-10 17:57:58 -0500
  • bb0be79 merge by Simran Bhutani 2018-11-09 12:10:23 -0500
  • e6ab1ea test methods covered by Simran Bhutani 2018-11-09 12:04:59 -0500
  • abcff63 Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 16:56:02 +0000
  • 4f2be4d stud ante method tested by Jonathan Hinds 2018-11-09 11:55:48 -0500
  • 3b592ca Slot tests by Lauren Green 2018-11-09 11:54:46 -0500
  • 771a66a Updated slot machine and tests by Lauren Green 2018-11-09 11:50:33 -0500
  • a071003 Merge branch 'newstud' of nsatinover/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 16:37:17 +0000
  • 119c369 merge resolved card game comments removed by nicholassatinover 2018-11-09 11:36:53 -0500
  • a830807 merge by nicholassatinover 2018-11-09 11:34:51 -0500
  • a3eeabd Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 16:31:15 +0000
  • 0cb8662 Merge by Lauren Green 2018-11-09 11:30:52 -0500
  • 23ce62a war testing at 82% by Jonathan Hinds 2018-11-09 11:29:11 -0500
  • afe86eb merge by Simran Bhutani 2018-11-09 11:12:13 -0500
  • 0b06315 Ignore ds store by Simran Bhutani 2018-11-09 11:11:40 -0500
  • c055f5c merge by nicholassatinover 2018-11-09 11:09:29 -0500
  • 2895dcc Card tests added by Lauren Green 2018-11-09 11:05:13 -0500
  • c2f3b76 Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino by Lauren Green 2018-11-09 10:42:34 -0500
  • 052d8f0 Commit before merging by Lauren Green 2018-11-09 10:42:12 -0500
  • 14c9964 merged sims tests and slots by Jonathan Hinds 2018-11-09 10:41:15 -0500
  • 09ca5ab about to merge with sim again by Jonathan Hinds 2018-11-09 10:26:22 -0500
  • bf0f1b5 Merge branch 'working' of sambhutani/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 15:26:07 +0000
  • fa1f81d resolved conflicts with slot tests by Simran Bhutani 2018-11-09 10:25:48 -0500
  • dc27e35 merge all sim changes by Simran Bhutani 2018-11-09 10:22:45 -0500
  • b6c140f Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into working by Jonathan Hinds 2018-11-09 10:18:21 -0500
  • a032213 pre merge with sim by Jonathan Hinds 2018-11-09 10:18:16 -0500
  • 118feb5 Merge branch 'working' of sambhutani/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 15:18:01 +0000
  • ba9adc0 pushing to slots by Simran Bhutani 2018-11-09 10:14:48 -0500
  • a7f3d5d Merge branch 'newstud' of nsatinover/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 14:26:49 +0000
  • 5185ec0 conflicts resolved by nicholassatinover 2018-11-09 09:26:04 -0500
  • adf9787 Merge branch 'working' of https://git.zipcode.rocks/nsatinover/ZCW-OOP-Casino into newstud by nicholassatinover 2018-11-09 09:21:12 -0500
  • a538db9 Merge conflict resolution by Lauren Green 2018-11-09 09:03:14 -0500
  • 6ed08bd Fix war compile issue by Lauren Green 2018-11-09 09:02:30 -0500
  • 9d0d2b7 tests for printer and war by Jonathan Hinds 2018-11-09 09:01:59 -0500
  • 60c21f3 68% test coverage for stud by nicholassatinover 2018-11-09 01:10:04 -0500
  • 450b13f stud at 45% by nicholassatinover 2018-11-08 23:10:18 -0500
  • 729c8cb Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-09 02:44:58 +0000
  • ce3c6d1 Merge by Lauren Green 2018-11-08 19:41:38 -0500
  • 77f1651 Final tests added by Lauren Green 2018-11-08 19:34:31 -0500
  • 900126e Tests written for Yahtzee Class by Lauren Green 2018-11-08 19:21:10 -0500
  • ccde6ad Yahtzee test progress by Lauren Green 2018-11-08 19:03:50 -0500
  • 1ac18e2 removed quit by Jonathan Hinds 2018-11-08 18:38:48 -0500
  • 4059d81 New working stud with betting removed, working test methods by nicholassatinover 2018-11-08 18:27:14 -0500
  • ec82737 refactored war by Jonathan Hinds 2018-11-08 18:09:41 -0500
  • 0cd8416 DicePlayer class no more print statements by Lauren Green 2018-11-08 18:02:16 -0500
  • d3f1727 Scoresheet Tests by Lauren Green 2018-11-08 17:57:23 -0500
  • 88f8441 Changes in scoresheet to simplify code and remove printing by Lauren Green 2018-11-08 17:29:49 -0500
  • 4c82f9a corrected printer class by Jonathan Hinds 2018-11-08 17:16:49 -0500
  • b19bd08 Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino by Lauren Green 2018-11-08 17:01:34 -0500
  • 5ad9fba Started changing print methods by Lauren Green 2018-11-08 17:00:24 -0500
  • c368a19 seperated casino and console by Jonathan Hinds 2018-11-08 17:00:19 -0500
  • b8145f0 backup by Lauren Green 2018-11-08 16:19:45 -0500
  • 793fdff Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino by Lauren Green 2018-11-08 16:18:47 -0500
  • 50dfc29 Merge branch 'slots' of sambhutani/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-08 21:18:26 +0000
  • 03e318a Merge by Simran Bhutani 2018-11-08 16:11:27 -0500
  • ed58911 added slot by Simran Bhutani 2018-11-08 16:07:22 -0500
  • 3a05c3d merging by Lauren Green 2018-11-08 15:41:59 -0500
  • 0262b67 merging by Lauren Green 2018-11-08 15:41:23 -0500
  • e0f2042 Backup by Lauren Green 2018-11-08 15:39:38 -0500
  • f4be1df Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into working by Jonathan Hinds 2018-11-08 15:37:38 -0500
  • e13559a removed ignored files by Jonathan Hinds 2018-11-08 15:37:09 -0500
  • de29fb5 updated wartest by Jonathan Hinds 2018-11-08 15:36:19 -0500
  • 934a8ec Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-08 20:28:28 +0000
  • 319ab83 More tests written by Lauren Green 2018-11-08 15:17:21 -0500
  • 45bffd0 Fix merge conflict by Lauren Green 2018-11-08 07:48:28 -0500
  • a65a443 Backing up changes by Lauren Green 2018-11-08 07:47:10 -0500
  • a30590d settled conflicts with stud by Jonathan Hinds 2018-11-07 18:27:59 -0500
  • 5c19f95 Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud by jonathan-hinds 2018-11-07 21:52:19 +0000
  • d083901 merge stud with working by nicholassatinover 2018-11-07 16:50:21 -0500
  • 10be383 merged with working by Simran Bhutani 2018-11-07 16:44:47 -0500
  • e54aa66 about to merge with working by Simran Bhutani 2018-11-07 16:42:36 -0500
  • 56531a6 minor changes during discussion with lauren by Jonathan Hinds 2018-11-07 15:58:13 -0500
  • fc8e516 Fix merge conflicts by Lauren Green 2018-11-07 15:45:26 -0500
  • e725de7 Changes by Lauren Green 2018-11-07 15:38:22 -0500
  • 90823ff minor fixes after meging war with working by Jonathan Hinds 2018-11-07 15:33:41 -0500
  • 731fd0d resolved conflicts afer meging war and working by Jonathan Hinds 2018-11-07 15:17:04 -0500
  • d8a9e8a update console with nextline instead of next by Jonathan Hinds 2018-11-07 15:11:11 -0500
  • a356217 Last update by Lauren Green 2018-11-07 15:07:53 -0500
  • 63e3a9d Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working by jonathan-hinds 2018-11-07 20:05:46 +0000
  • b20be8d Made it so you can play another game by Lauren Green 2018-11-07 15:04:03 -0500
  • 7cb86fa Added a return to console by Lauren Green 2018-11-07 14:46:02 -0500
  • dfd5d65 completed war method by Jonathan Hinds 2018-11-07 13:49:59 -0500
  • 5739ee8 Fixed so that three of a kind could take a four of a kind and a yahtzee by Lauren Green 2018-11-07 13:31:46 -0500
  • 7fc8ebf Changed payout amount by Lauren Green 2018-11-07 12:08:00 -0500
  • da2e13d Caught a mistake in reRoll, all set now by Lauren Green 2018-11-07 11:53:01 -0500
  • 9a4e371 slots by Simran Bhutani 2018-11-06 17:40:19 -0500
  • bb48591 Merge branch 'yahtzee' by Lauren Green 2018-11-06 17:16:15 -0500
  • 31ce2bd Small Updates by Lauren Green 2018-11-06 17:12:54 -0500
  • 2d43898 Merge branch 'stud' of nsatinover/ZCW-OOP-Casino into stud by jonathan-hinds 2018-11-06 21:58:02 +0000
  • 6aa4fcd merge war w/ stud by nicholassatinover 2018-11-06 16:56:41 -0500
  • fad12e2 Small tweaks by Lauren Green 2018-11-06 16:55:57 -0500
  • ecd1604 merge for war card win method by nicholassatinover 2018-11-06 16:39:23 -0500
  • 47a6851 war finished - except for war method by Jonathan Hinds 2018-11-06 16:35:08 -0500
  • fa602a5 Yahtzee working. Bugs seem to be all worked out. Need a return to console at end. by Lauren Green 2018-11-06 16:21:05 -0500
  • c8aa611 create slots branch by Simran Bhutani 2018-11-06 14:03:04 -0500
  • 769ef57 Yahtzee class written by Lauren Green 2018-11-06 13:54:17 -0500
  • 111e479 merged stud with war - new CardGame methods by nicholassatinover 2018-11-06 13:40:55 -0500
  • ae1192b about to merge with war by nicholassatinover 2018-11-06 13:36:04 -0500
  • 6b9d5f3 Modified CardGame class to have chooseStartingPlayer and chooseNextPlayer by Jonathan Hinds 2018-11-06 12:41:12 -0500
  • dcff236 Saving user input updates for Yahtzee and ScoreSheet by Lauren Green 2018-11-06 12:06:59 -0500