Skip to content
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

F16 Lab04 Pull Request #2

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

F16 Lab04 Pull Request #2

wants to merge 49 commits into from

Commits on Oct 20, 2016

  1. added updated version of SimpleGUI to my src dir - done with step 5

    @thatonesimon
    thatonesimon committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    3cc3086 View commit details
    Browse the repository at this point in the history

  2. updated simplegui1

    @johnnyzhang295
    johnnyzhang295 committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    4dd3a69 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2016

  1. created Sponge and SpongeBob classes

    @johnnyzhang295
    johnnyzhang295 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    8aec14d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2016

  1. fixed snowman

    @thatonesimon
    thatonesimon committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    f695e83 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. advanced files copied

    @thatonesimon
    thatonesimon committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    6c7f719 View commit details
    Browse the repository at this point in the history

  2. started tree

    @thatonesimon
    thatonesimon committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    ce7fb23 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. updated some tree

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    ac54e59 View commit details
    Browse the repository at this point in the history

  2. trees is pretty good

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    ca67573 View commit details
    Browse the repository at this point in the history

  3. Update Tree.java

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    9ba423d View commit details
    Browse the repository at this point in the history

  4. Update Tree.java

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    5a92ee7 View commit details
    Browse the repository at this point in the history

  5. Update Tree.java

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    dc0d529 View commit details
    Browse the repository at this point in the history

  6. created TreeWithFruits.java

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    ae190d8 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:thatonesimon/F16-lab04

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    d371f36 View commit details
    Browse the repository at this point in the history

  8. moved some things around

    @thatonesimon
    thatonesimon committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    6a74fb0 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2016

  1. added simpleGui, finished step 5

    @sayalirkakade
    sayalirkakade committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    869e299 View commit details
    Browse the repository at this point in the history

  2. snowman completed

    @sayalirkakade
    sayalirkakade committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    3568b44 View commit details
    Browse the repository at this point in the history

  3. i made a tree, and one with fruit

    @thatonesimon
    thatonesimon committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    6f3ff5e View commit details
    Browse the repository at this point in the history

  4. javadoc commit

    @thatonesimon
    thatonesimon committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    ed8b349 View commit details
    Browse the repository at this point in the history

  5. finished Star.java class

    @sayalirkakade
    sayalirkakade committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    eb23d1d View commit details
    Browse the repository at this point in the history

  6. Christmas Tree extends Tree

    @mschanteltc
    mschanteltc committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    49c0968 View commit details
    Browse the repository at this point in the history

  7. added shooting star class

    @sayalirkakade
    sayalirkakade committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    2dc659d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2016

  1. added updated version of SimpleGui1 to my src directory- done with st… 

    …ep 5
    @vchandran2
    vchandran2 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    5cef80d View commit details
    Browse the repository at this point in the history

  2. made the greatest snowman of all timegit add src/edu/ucsb/cs56/drawin… 

    …gs/vchandran2/simple/git add src/edu/ucsb/cs56/drawings/vchandran2/simple/
    @vchandran2
    vchandran2 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    145094a View commit details
    Browse the repository at this point in the history

  3. VW finished lab 4

    Your Name committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    068e03a View commit details
    Browse the repository at this point in the history

  4. completed lab

    @sayalirkakade
    sayalirkakade committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    d2fa85a View commit details
    Browse the repository at this point in the history

  5. finished advanced

    @vchandran2
    vchandran2 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    925804d View commit details
    Browse the repository at this point in the history

  6. generate javadoc

    @vchandran2
    vchandran2 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    8ee995b View commit details
    Browse the repository at this point in the history

  7. drew some more trees

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    746663c View commit details
    Browse the repository at this point in the history

  8. Update AllMyDrawings.java

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    9d010ed View commit details
    Browse the repository at this point in the history

  9. Update AllMyDrawings.java

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    82d209e View commit details
    Browse the repository at this point in the history

  10. Update AllMyDrawings.java

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    0bfc2b4 View commit details
    Browse the repository at this point in the history

  11. javadoc added?

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    8df4452 View commit details
    Browse the repository at this point in the history

  12. fixed up some comments

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    c36a767 View commit details
    Browse the repository at this point in the history

  13. comments should be good

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    bfd92be View commit details
    Browse the repository at this point in the history

  14. comments updated

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    0b4b46b View commit details
    Browse the repository at this point in the history

  15. Update Tree.java

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    407387d View commit details
    Browse the repository at this point in the history

  16. Update TreeWithFruits.java

    @thatonesimon
    thatonesimon committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    aeae24a View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2016

  1. removed javadoc

    @thatonesimon
    thatonesimon committed Oct 31, 2016
    Configuration menu
    Copy the full SHA
    d2247c7 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2016

  1. Merge pull request #1 from johnnyzhang1738/master 

    Added a Sponge and SpongeBob class under johnnyzhang directory
    @jimmylle
    jimmylle committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    395e65b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from mschanteltc/master 

    Added a ChristmasTree class under ctc directory
    @jimmylle
    jimmylle committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    f66beb8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from vincentwangg/master 

    VW finished lab 4
    @jimmylle
    jimmylle committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    54ce993 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from sayalirkakade/master 

    Sayali’s lab04 submission, a class to draw a ShootingStar
    @jimmylle
    jimmylle committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    4216ac7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6 from vchandran2/master 

    Added a Money and DollarBill class under the vchandran2 subdirectory
    @jimmylle
    jimmylle committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    f839aef View commit details
    Browse the repository at this point in the history

  6. removed case 4 and 5

    @thatonesimon
    thatonesimon committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    c49e245 View commit details
    Browse the repository at this point in the history

  7. removed 4 and 5

    @thatonesimon
    thatonesimon committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    45fcea2 View commit details
    Browse the repository at this point in the history

  8. fix copy paste error

    @thatonesimon
    thatonesimon committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    4710c41 View commit details
    Browse the repository at this point in the history

  9. Update AllMyDrawings.java

    @thatonesimon
    thatonesimon committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    edf307d View commit details
    Browse the repository at this point in the history

  10. Update AllMyDrawings.java

    @thatonesimon
    thatonesimon committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    97eab8f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2016

  1. Merge pull request #9 from thatonesimon/master 

    Added a Tree class under sswong directory
    @jimmylle
    jimmylle committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    878fc81 View commit details
    Browse the repository at this point in the history