Allison Ziegler
|
d4eea0afe8
|
Merge branch 'dev' into blackjack
|
6 years ago |
Allison Ziegler
|
c6890f521b
|
working on blackjack
|
6 years ago |
Shivam Patel
|
a0de7aed61
|
commented out
|
6 years ago |
Nicholas Maidanos
|
744d3201c8
|
War class created without UI
|
6 years ago |
shivam patel
|
038862d121
|
renamed war2 to War
|
6 years ago |
shivam patel
|
46c5ce7b25
|
OG war dont need
|
6 years ago |
Shivam Patel
|
0ba3cdb6d0
|
dummy game works
|
6 years ago |
Tommy Rogers
|
43fc0d6fc9
|
finsihed threes
|
6 years ago |
David Thornley
|
42f828d2aa
|
compilable code
|
6 years ago |
David Thornley
|
2bfb6a4852
|
refactored Player class to align with new game interface idea
|
6 years ago |
David Thornley
|
3c8a57e4d8
|
merge with dev
|
6 years ago |
David Thornley
|
57f2ae24a1
|
refactored war class to align with updates on war branch
|
6 years ago |
David Thornley
|
0f2e233fe5
|
added test cases for player class
|
6 years ago |
Allison Ziegler
|
20e0bb3298
|
committing before merge
|
6 years ago |
Allison Ziegler
|
aa71742b42
|
refactored CardGame and CardDeck
|
6 years ago |
Tommy Rogers
|
3fd0716060
|
aklfeanfenfMerge branch 'dev' into threes
|
6 years ago |
Tommy Rogers
|
b47665504a
|
added more to threes
|
6 years ago |
David Thornley
|
39d6c63646
|
merge
|
6 years ago |
David Thornley
|
74a1e1443c
|
finsihed player class build out
|
6 years ago |
Allison Ziegler
|
a576db1702
|
delete war
|
6 years ago |
Allison Ziegler
|
9a75d3d899
|
committing changes
|
6 years ago |
Shivam Patel
|
88f95b12b7
|
dummy game class
|
6 years ago |
Tommy Rogers
|
82964550b9
|
Merge branch 'Tommy' into dev
helkugkgkqp
|
6 years ago |
Tommy Rogers
|
f9c8a6bd54
|
added more to threes
|
6 years ago |
David Thornley
|
eedc514900
|
added updatedUML
|
6 years ago |
David Thornley
|
83b20bffed
|
clean up
|
6 years ago |
David Thornley
|
bec77551b7
|
added unit tests for all preMadeMessages
|
6 years ago |
Shivam Patel
|
ad5f8639e4
|
Merge branch 'dev' of https://git.zipcode.rocks/shiv-365/CR-MacroLabs-OOP-Casino into shiv
shitstom
|
6 years ago |
Shivam Patel
|
ede7873355
|
deleted war1
|
6 years ago |
Nicholas Maidanos
|
d013b4874c
|
Merge branch 'nmaidanos' into dev
|
6 years ago |
Nicholas Maidanos
|
63f5c8a8f7
|
small change in the game interface
|
6 years ago |
Shivam Patel
|
9db0f49fea
|
shit
|
6 years ago |
Shivam Patel
|
9825bbc8e8
|
blackjck
|
6 years ago |
Nicholas Maidanos
|
59254e1ae4
|
Merge branch 'nmaidanos' into dev
|
6 years ago |
Shivam Patel
|
7ca6d418de
|
blackjack in progress
|
6 years ago |
Nicholas Maidanos
|
005bb26eb5
|
Added a War2 class kinda like a test of war and also added the game interface
|
6 years ago |
Allison Ziegler
|
f1e99756a4
|
conflicts resolved
|
6 years ago |
Allison Ziegler
|
945b4c6185
|
some stuff
|
6 years ago |
David Thornley
|
5958e74761
|
merge
|
6 years ago |
David Thornley
|
fc9a3c6007
|
updated format on card images, commented out broken code
|
6 years ago |
Tommy Rogers
|
5e9276d08f
|
Merge branch 'dev' into Tommy
merge
|
6 years ago |
Tommy Rogers
|
102efc0d86
|
edited dice and started threes
|
6 years ago |
Allison Ziegler
|
c5c3682631
|
Merge branch 'allison' into dev
|
6 years ago |
Allison Ziegler
|
5f5e87ab1c
|
changed tostring in card
|
6 years ago |
David Thornley
|
f95e793ba6
|
moved suits and card images out of preMadeMessages
|
6 years ago |
Shivam Patel
|
98f473d065
|
Merge branch 'dev' into shiv
mergem
|
6 years ago |
David Thornley
|
c82204c99d
|
merge
|
6 years ago |
David Thornley
|
826b73f9b2
|
updated game menus
|
6 years ago |
Shivam Patel
|
28f6365f45
|
merges
|
6 years ago |
Allison Ziegler
|
35c3690fcf
|
Merge branch 'dev' of https://git.zipcode.rocks/shiv-365/CR-MacroLabs-OOP-Casino into dev
"pulling dev"
|
6 years ago |