Erika Savell
|
54d4ea2d03
|
Merge remote-tracking branch 'origin/story9' into mergePacedLoop
# Conflicts:
# .idea/compiler.xml
# .idea/misc.xml
|
9 years ago |
|
Erika Savell
|
0dc5efd830
|
Just trying to fix my ide
|
9 years ago |
Fan-Wu Yang
|
0729ae719d
|
Implemented Display a Boat as a circle.
- created displayBoat function which will display a circle at a Coordinate.
#story[9] #pair[cbt24, fwy13]
|
9 years ago |
|
Erika Savell
|
41cdf09dc2
|
Started merging team 8 paced loop into team 7 codebase.
-No running! Syntax errors and not done merging
-Just pushing so David can pull changes
#pair[zwu18, esa46]
|
9 years ago |
|
Fan-Wu Yang
|
f62c4dcb3d
|
Added Display of all Boats participating in the race, and a message to seperate this and the events in the console.
|
9 years ago |
|
Fan-Wu Yang
|
21487340ab
|
Story 1 completion, Added Boat and Event classes. The program displays two boats New Zealand and America.
|
9 years ago |
