Skip to content

PR for MP4 Submission #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

PR for MP4 Submission #30

wants to merge 29 commits into from

Conversation

isaacvandor
Copy link

MP4 Submission from Isaac and Raquel

isaacvandor and others added 29 commits March 6, 2018 12:21
@isaacvandor
Added links to wiki for project proposal etc.
8e95322
@isaacvandor
Added base file for card detection and texting file for haarcascade c…
b8573cd 
…lassifier
@isaacvandor
Added first pass at card identification. Works by taking a picture of…
135fb4e 
… the corner of the card. Nothing is broken, I swear.....
@isaacvandor
Added suit and rank training set data
08feef1
@isaacvandor
Card detection works...added setup functions file.
ddfbe13
@ridunoff
Blackjack game functions
1753e0b
@ridunoff
Merge branch 'master' of https://github.com/isaacvandor/InteractivePr…
a50cd9f 
…ogramming into cards
@ridunoff
Merge pull request #1 from isaacvandor/cards
48d9bfb 
Cards
@ridunoff
Merge pull request #2 from isaacvandor/opencv
1b0e3e4 
Opencv
@isaacvandor
Imported card_detect into blackjack and passed rank_name and suit_nam…
d532f37 
…e into dealt hand
@ridunoff
added UML diagram
24a6488
@ridunoff
Added atribute descriprion to Game
08458c8
@ridunoff
Added Opencv Card to Player Hand
644e5bd
@ridunoff
Laptop cam edits and returned to normal
35c5eb3
@isaacvandor
Added standalone card detection for testing
958f027
@ridunoff
Added p1 line
71e955e
@ridunoff
Merge branch 'master' of https://github.com/isaacvandor/InteractivePr…
54bb676 
…ogramming
@ridunoff
Fixed Card class
405823f
@ridunoff
UML diagram for the wiki
ebf700e
@isaacvandor
Added ability to input two cards from the player into the game
7e4bf9a
@isaacvandor
Merge branch 'master' of https://github.com/isaacvandor/InteractivePr…
152193d 
…ogramming
@ridunoff
Hit stuff
bb4ca3d
@ridunoff
card detect
c358257
@ridunoff
Updated to reflect current master branch status
3c264d1
@isaacvandor
Added results images for submission purposes
d2addc2
@isaacvandor
Update README.md
af500c0
@isaacvandor
Added requirements.txt file
8b0c5cb
@isaacvandor
Merge branch 'master' of https://github.com/isaacvandor/InteractivePr…
7891243 
…ogramming
@isaacvandor
Update README.md
1a78a1c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@isaacvandor @ridunoff