Complete#14

Open

deltaGPhys wants to merge 300 commits intoZipCodeCore:masterfrom deltaGPhys:master

+5,672-76

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 4, 2019

Merge branch 'crapsJack' of https://github.com/deltaGPhys/Maven.Casino into craps

David Trombello
authored and
David Trombello
committed
Merge branch 'crapsJack' of https://github.com/deltaGPhys/Maven.Casino into craps

David Trombello
authored and
David Trombello
committed
rearranged startPlay and roundOfPlay, and stubbed out

Jack Harris
authored and
Jack Harris
committed
coordinating with Jack

David Trombello
authored and
David Trombello
committed
merge conflict

David Trombello
authored and
David Trombello
committed
added tests and game logic for craps - one test not passing

Jack Harris
authored and
Jack Harris
committed
Player tests working

David Trombello
authored and
David Trombello
committed
blackjack flow impreovements
deltaGPhys
committed
Player tests all pass

David Trombello
authored and
David Trombello
committed
updated some thoughts on methods

David Trombello
authored and
David Trombello
committed
gameServices and tests
deltaGPhys
committed
wagering
deltaGPhys
committed
got music to workgit add . Now it can stop and play other songs. Also edited storyline
Sandicus
committed
GoFish changes

Brian Patterson
authored and
Brian Patterson
committed
Merge branch 'GoFish2' of https://github.com/deltaGPhys/Maven.Casino into GoFish2
deltaGPhys
committed
Merge branch 'Music' of https://github.com/deltaGPhys/Maven.Casino into Music
deltaGPhys
committed

Commits on Nov 5, 2019

menu spacing
deltaGPhys
committed
move music player and BJ dialogue edits
deltaGPhys
committed
Music nows plays everywhere and i mean EVERYWHERE
Sandicus
committed
Merge branch 'MusicToo' of https://github.com/deltaGPhys/Maven.Casino into MusicToo
deltaGPhys
committed
utilities package
deltaGPhys
committed
just committing
Sandicus
committed
craps player test complete

David Trombello
authored and
David Trombello
committed
still working
Gbunde
committed
craps player tests working

David Trombello
authored and
David Trombello
committed
fixed the non-passing test in winOnSubsequentTest

Jack Harris
authored and
Jack Harris
committed
added console printing and redirects to calculatePayout inside the craps game

Jack Harris
authored and
Jack Harris
committed
menu updated

David Trombello
authored and
David Trombello
committed
Merge branch 'crapsJack' of https://github.com/deltaGPhys/Maven.Casino into craps

David Trombello
authored and
David Trombello
committed
updated game messages

David Trombello
authored and
David Trombello
committed
COMMENCE EPIC INTRO
Sandicus
committed
The opening just got cooler
Sandicus
committed
added a intro sound effect, cool beans
Sandicus
committed
bloop
Sandicus
committed
updatd methods for user input to roll dice

David Trombello
authored and
David Trombello
committed
updated user input rolling methods

David Trombello
authored and
David Trombello
committed
branch change
deltaGPhys
committed
commit before pull

Jack Harris
authored and
Jack Harris
committed
merge conflict
deltaGPhys
committed
typos
deltaGPhys
committed
getting ready to pull from dev

Jack Harris
authored and
Jack Harris
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into craps

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsJack

Jack Harris
authored and
Jack Harris
committed
halfway
Gbunde
committed
added psvm - can run a sample game now

Jack Harris
authored and
Jack Harris
committed
teller menu complete
deltaGPhys
committed
acutally merging teller menu
deltaGPhys
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsJack

Jack Harris
authored and
Jack Harris
committed
Create ASCII of instructors
jackaharrisii
authored
toASCII method for CardSets and implementation
deltaGPhys
committed
creating methods for functions in round of play

David Trombello
authored and
David Trombello
committed
pushing before a merge

Jack Harris
authored and
Jack Harris
committed
Merge branch 'craps' of https://github.com/deltaGPhys/Maven.Casino into crapsJack

Jack Harris
authored and
Jack Harris
committed
working on endings
Sandicus
committed
added periods to screen prints

Jack Harris
authored and
Jack Harris
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into MusicFour
Sandicus
committed
Console class implemented

David Trombello
authored and
David Trombello
committed
card set addmultiple
deltaGPhys
committed
blooopp
Sandicus
committed
epic intro is a go
Sandicus
committed
Merge remote-tracking branch 'origin/MusicFour' into dev
deltaGPhys
committed
Merge branch 'MusicFour' of https://github.com/deltaGPhys/Maven.Casino into dev
deltaGPhys
committed
access to initial winnings
deltaGPhys
committed
almost
Gbunde
committed
played with interface and added betting - still need to finish interface and add a payout table

Jack Harris
authored and
Jack Harris
committed
minor GF updates

Brian Patterson
authored and
Brian Patterson
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into craps

David Trombello
authored and
David Trombello
committed
cleaned up game info

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into MusicFour
Sandicus
committed
round of play cleaned up

David Trombello
authored and
David Trombello
committed
updated table limits

David Trombello
authored and
David Trombello
committed
updated bet choice menu with table limits

David Trombello
authored and
David Trombello
committed
game is allowing wagers, but the amount won or lost has little to do with the result of the game

Jack Harris
authored and
Jack Harris
committed
fixed merge conflict

Jack Harris
authored and
Jack Harris
committed
crad suite display
deltaGPhys
committed
functioning endings
Sandicus
committed
remove card fixed
deltaGPhys
committed
removeRank
deltaGPhys
committed
committing to pull

Brian Patterson
authored and
Brian Patterson
committed
bet choices just about complete logic done need balance to work

David Trombello
authored and
David Trombello
committed
added a bunch of tests for calculateWinnings - no longer win money on losses, but not all the winnings are coming out right

Jack Harris
authored and
Jack Harris
committed
merge conflicts resolved

David Trombello
authored and
David Trombello
committed
fixed merge conflicts

Jack Harris
authored and
Jack Harris
committed
another merge conflict

Jack Harris
authored and
Jack Harris
committed
working to resolve merge conflicts

David Trombello
authored and
David Trombello
committed
trying to resolve merge conflict

David Trombello
authored and
David Trombello
committed
bet choices updated to work correctly

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' into crapsJack

Jack Harris
authored and
Jack Harris
committed
splitting
deltaGPhys
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into dev
deltaGPhys
committed
Three endings up and ready to go, more ASCII to come
Sandicus
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into MusicFour
Sandicus
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into temp
deltaGPhys
committed
working
Gbunde
committed
Merge branch 'RRstub' of https://github.com/deltaGPhys/Maven.Casino into temp
deltaGPhys
committed
blackjack split works
deltaGPhys
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into dev
deltaGPhys
committed
Merge branch 'temp' into dev
deltaGPhys
committed
Craps music and ascii is a go
Sandicus
committed
updated wager

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into craps

David Trombello
authored and
David Trombello
committed

Commits on Nov 6, 2019

Merge branch 'craps' of https://github.com/deltaGPhys/Maven.Casino into crapsJack

Jack Harris
authored and
Jack Harris
committed
Moved GFRound to GFGame

Brian Patterson
authored and
Brian Patterson
committed
GFG opponen turn beginning

Brian Patterson
authored and
Brian Patterson
committed
Main ascii art is done, and all story portions are just about there
Sandicus
committed
finished player/npc loop

Brian Patterson
authored and
Brian Patterson
committed
fix aces bug
deltaGPhys
committed
Delete .DS_Store
deltaGPhys
authored
gitignore
deltaGPhys
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into dev
deltaGPhys
committed
Delete .DS_Store
deltaGPhys
authored
Delete .DS_Store
deltaGPhys
authored
Delete .DS_Store
deltaGPhys
authored
Delete .DS_Store
deltaGPhys
authored
Delete .DS_Store
deltaGPhys
authored
Delete .DS_Store
deltaGPhys
authored
Delete .DS_Store
deltaGPhys
authored
minor test updates

Brian Patterson
authored and
Brian Patterson
committed
Merge branch 'dev'
deltaGPhys
committed
committing
Sandicus
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsJack

Jack Harris
authored and
Jack Harris
committed
pre-merge
deltaGPhys
committed
trying to merge

David Trombello
authored and
David Trombello
committed
preparing to merge into dev

Jack Harris
authored and
Jack Harris
committed
Merge Party

Brian Patterson
authored and
Brian Patterson
committed
Merge branch 'craps' of https://github.com/deltaGPhys/Maven.Casino into crapsJack

Jack Harris
authored and
Jack Harris
committed
premerge
Sandicus
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into ascii
Sandicus
committed
Merge Party

Brian Patterson
authored and
Brian Patterson
committed
ascii merge
Sandicus
committed
ln stuff
deltaGPhys
committed
merge dev
deltaGPhys
committed
merge dev
deltaGPhys
committed
worked with print delays
Sandicus
committed
gofissssh
deltaGPhys
committed
tweeking with strings
Sandicus
committed
Merge branch 'ascii3' of https://github.com/deltaGPhys/Maven.Casino into ascii3
deltaGPhys
committed
minor navigation
deltaGPhys
committed
pulling

Brian Patterson
authored and
Brian Patterson
committed
menus
deltaGPhys
committed
ascii for dice
deltaGPhys
committed
cap
deltaGPhys
committed
added test

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsdt

David Trombello
authored and
David Trombello
committed
enter bug for chris
deltaGPhys
committed
gameplay tweeking and strings
Sandicus
committed
gimme dev
Sandicus
committed
ready to show ascii dice and need to fix payouts

Jack Harris
authored and
Jack Harris
committed
roll counter consolidated

David Trombello
authored and
David Trombello
committed
testing game loop

Brian Patterson
authored and
Brian Patterson
committed
got the winOnSubsequent payout working correctly

Jack Harris
authored and
Jack Harris
committed
working on ASCII dice

David Trombello
authored and
David Trombello
committed
Merge branch 'crapsJack' of https://github.com/deltaGPhys/Maven.Casino into crapsdt

David Trombello
authored and
David Trombello
committed
SONGS AINT OVERLAPPING ON MY WATCH
Sandicus
committed
ASCII dice working

David Trombello
authored and
David Trombello
committed
Merge conflict fixed

David Trombello
authored and
David Trombello
committed
ascii art and messages cleaned up

David Trombello
authored and
David Trombello
committed
ascii again, it never ends
Sandicus
committed
set craps game table limits in GameRepo

David Trombello
authored and
David Trombello
committed
ascii and more ascii
Sandicus
committed
updated changes to betting menu to be able to leave

David Trombello
authored and
David Trombello
committed
Craps music has been fixed
Sandicus
committed
merging to dev
Sandicus
committed
lemme merge darn it lol
Sandicus
committed
worked on Tests
Gbunde
committed
Merge remote-tracking branch 'origin' into dev
Sandicus
committed
stash
deltaGPhys
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into mergeGame
deltaGPhys
committed
merge conflict
deltaGPhys
committed
Merge branch 'crapsdt' into dev
deltaGPhys
committed
mergee
Sandicus
committed
gimme dev pls
Sandicus
committed
tweeking music and strings
Sandicus
committed
merge confl
deltaGPhys
committed
RRTest move
deltaGPhys
committed
fixed teller ascii
Sandicus
committed
functioning loopssssss

Brian Patterson
authored and
Brian Patterson
committed
fixed conflicts
Sandicus
committed
test

Brian Patterson
authored and
Brian Patterson
committed

Commits on Nov 7, 2019

now u die in roulette
Sandicus
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into asciiart
Sandicus
committed
merge
Sandicus
committed
you can die in roullete merge
Sandicus
committed
Merge branch 'asciiart' of https://github.com/deltaGPhys/Maven.Casino into dev
deltaGPhys
committed
tweeking string outputs
Sandicus
committed
mergee
Sandicus
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into dev
Sandicus
committed
merging string edits
Sandicus
committed
some GF tests
deltaGPhys
committed
pulling test updates

Brian Patterson
authored and
Brian Patterson
committed
merge
deltaGPhys
committed
fixing conflicts

Brian Patterson
authored and
Brian Patterson
committed
Tests added to finish craps

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsdt

David Trombello
authored and
David Trombello
committed
Roulette is done for reals
Sandicus
committed
mergin final roulette edits
Sandicus
committed
more tests for fisih and NPCfish
deltaGPhys
committed
Merge branch 'gftests' into dev
deltaGPhys
committed
win condition works

Brian Patterson
authored and
Brian Patterson
committed
reset implemented

Brian Patterson
authored and
Brian Patterson
committed
game services fixes merge
deltaGPhys
committed
ending money text fix merge
deltaGPhys
committed
string editing bloop
Sandicus
committed
removing unnecessary exceptions and imports
deltaGPhys
committed
pulling dev
Sandicus
committed
merging dev to gameplay2
Sandicus
committed
more problematic exceptions removed
deltaGPhys
committed
fixed merge conflicts
Sandicus
committed
pulling dev
Sandicus
committed
merging gameplay2 to dev
Sandicus
committed
skip prologue with enter
deltaGPhys
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into dev
deltaGPhys
committed
go fish scan for suites test passing
deltaGPhys
committed
player tests
deltaGPhys
committed
things

Brian Patterson
authored and
Brian Patterson
committed
Tried to get return to game menu working

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsdt

David Trombello
authored and
David Trombello
committed
card sanitization fix
deltaGPhys
committed
pull prep

Brian Patterson
authored and
Brian Patterson
committed
.

Brian Patterson
authored and
Brian Patterson
committed
BJ quit at beginning
deltaGPhys
committed

Commits on Nov 8, 2019

message update

Brian Patterson
authored and
Brian Patterson
committed
merging

Brian Patterson
authored and
Brian Patterson
committed
craps now displays amount won in the winning message

Jack Harris
authored and
Jack Harris
committed
Merge branch 'dev' into crapsWinnings

Jack Harris
authored and
Jack Harris
committed
fixed winning on first roll message

Jack Harris
authored and
Jack Harris
committed
final wager message fix

Jack Harris
authored and
Jack Harris
committed
craps menu and tests passing and work with ASCII die

David Trombello
authored and
David Trombello
committed
merge conflicts resolved

David Trombello
authored and
David Trombello
committed
ASCII die reformatted to be underneath messages

David Trombello
authored and
David Trombello
committed
ASCII dice on bottom tests pass

David Trombello
authored and
David Trombello
committed
prologue skip fix and gf fish music fix
deltaGPhys
committed
bj option 5 quitting fix
deltaGPhys
committed
rr game music stopping
deltaGPhys
committed
merging message

Brian Patterson
authored and
Brian Patterson
committed
Merge branch 'GF5' of https://github.com/deltaGPhys/Maven.Casino into GF5
deltaGPhys
committed
GF message fix and player choice resstriction
deltaGPhys
committed
wincheck fix
deltaGPhys
committed
GF quit
deltaGPhys
committed
craps music repeats
deltaGPhys
committed
deleting unused stuff
deltaGPhys
committed
deleting merge game
deltaGPhys
committed
comment prune
deltaGPhys
committed
unnecessary try block remove
deltaGPhys
committed
more tests for rr

David Trombello
authored and
David Trombello
committed
Merge branch 'dev' of https://github.com/deltaGPhys/Maven.Casino into crapsdt

David Trombello
authored and
David Trombello
committed
tests pass RR working

David Trombello
authored and
David Trombello
committed
minor output tweak in happy ending
deltaGPhys
committed
minor cleanup
deltaGPhys
committed

Commits on Jan 18, 2020

.
deltaGPhys
committed