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

Lab07 submissions #16

Open
wants to merge 50 commits into
base: lab07branch
Choose a base branch
from
Open

Lab07 submissions #16

wants to merge 50 commits into from

Commits on Feb 13, 2014

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

    …tep 5
    Jenny So committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    d5d0480 View commit details
    Browse the repository at this point in the history

  2. added updated version of SimpleGUI1 to my src directory - done with S… 

    …tep 5
    @menaiskander
    menaiskander committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    7c9d42c View commit details
    Browse the repository at this point in the history

  3. copied source files and updated package names into simple directory -… 

    … done with Step 7
    Jenny So committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    d98537f View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2014

  1. added updated verssion of SimpleGUI1, done with step 5

    Gary Mak committed Feb 14, 2014
    Configuration menu
    Copy the full SHA
    ba307c9 View commit details
    Browse the repository at this point in the history

  2. added updated version of SimpleGUI1 to my src directory - done with S… 

    …tep 5
    @vinlara
    vinlara committed Feb 14, 2014
    Configuration menu
    Copy the full SHA
    5bc3ea1 View commit details
    Browse the repository at this point in the history

  3. Added an updated version of SimpleGui1 to my src directory- Step 5 co… 

    …mplete
    @ashedden
    ashedden committed Feb 14, 2014
    Configuration menu
    Copy the full SHA
    dc4091c View commit details
    Browse the repository at this point in the history

  4. Added updated version of SimpleGUI1 to my src directory - done with S… 

    …tep 5
    Logan Schmidt committed Feb 14, 2014
    Configuration menu
    Copy the full SHA
    799ea59 View commit details
    Browse the repository at this point in the history

  5. added snowman head and copied advanced files

    Jenny So committed Feb 14, 2014
    Configuration menu
    Copy the full SHA
    fc32f77 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2014

  1. added updated version of SimpleGui1.java to my src directory - done w… 

    …ith step 5
    Sarah Darwiche committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    2fcc1fe View commit details
    Browse the repository at this point in the history

  2. snoman head added

    Sarah Darwiche committed Feb 16, 2014
    Configuration menu
    Copy the full SHA
    29698a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2014

  1. In the process of finishing final step

    Sarah Darwiche committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    fe6d120 View commit details
    Browse the repository at this point in the history

  2. added updated version of SimpleGUI1 to my src directory - done with S… 

    …tep 5
    @rkjha7
    rkjha7 committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    bd891d5 View commit details
    Browse the repository at this point in the history

  3. completed step 8, fixed the snowman

    @rkjha7
    rkjha7 committed Feb 17, 2014
    Configuration menu
    Copy the full SHA
    3c111b0 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2014

  1. created Cat and FancyCat in place of House, HouseWithWindows, and Cof… 

    …feeCup
    Jenny So committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    d60cb4f View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2014

  1. finished with step 8 fix the snowman

    @vinlara
    vinlara committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    0a35327 View commit details
    Browse the repository at this point in the history

  2. added updated version of SimpleGUI1 to my src directory - done with S… 

    …tep 5
    @ashedden
    ashedden committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    2236ab4 View commit details
    Browse the repository at this point in the history

  3. Gave the snowman a head; made a CerealBowl.java and CerealBowlWithChe… 

    …x.java for my own GUI
    @ashedden
    ashedden committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    682293e View commit details
    Browse the repository at this point in the history

  4. Drawings done, the hockey sticks are beautiful

    @rkjha7
    rkjha7 committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    67036e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. finished lab06 and updated javadoc comments

    Gary Mak committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    949e80f View commit details
    Browse the repository at this point in the history

  2. Delete .#TicTacToeTable.java

    xgmak94 committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    ecafcd8 View commit details
    Browse the repository at this point in the history

  3. Delete #TicTacToeTable.java#

    xgmak94 committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    b6c791e View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2014

  1. added updated version of SimpleGUI1 to my src directory - done with S… 

    …tep 5
    George Chen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    3bc6d69 View commit details
    Browse the repository at this point in the history

  2. Fixed the coordinates of the hourglass

    @vinlara
    vinlara committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    6dc4ef5 View commit details
    Browse the repository at this point in the history

  3. Completed the Hourglass and HourglassFull shape.

    @vinlara
    vinlara committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    2ccb8fd View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2014

  1. added updated version of SimpleGUI1 to my src directory - did this ea… 

    …rlier, but it disappeared for an unknown reason. Classes are already finished to end lab06
    @ashedden
    ashedden committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    8444689 View commit details
    Browse the repository at this point in the history

  2. Finished with lab06

    George Chen committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    3550088 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2014

  1. Fixed a comment

    @ashedden
    ashedden committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    178f132 View commit details
    Browse the repository at this point in the history

  2. completed lab06

    @menaiskander
    menaiskander committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    25c4e54 View commit details
    Browse the repository at this point in the history

  3. final changes made to lab 6

    Sarah Darwiche committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    4bdb4e9 View commit details
    Browse the repository at this point in the history

  4. added Mushroom and MarioMushroom classes

    Natasha Issayeva committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    66bf7d7 View commit details
    Browse the repository at this point in the history

  5. removed some unnecessary files

    Natasha Issayeva committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    c13f9b0 View commit details
    Browse the repository at this point in the history

  6. Finished drawings

    Logan Schmidt committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    c7109a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2014

  1. Updated AllMyDrawings and Hourglass

    @vinlara
    vinlara committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    cd952b7 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2014

  1. Merge pull request #1 from j-so/master 

    Added Cat and Fancy Cat classes, modified Snowman, and SimpleGui1
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    6a32705 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from ashedden/master 

    Added a simple Gui of cereal bowls with and without Chex cereal
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    a17180c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from rkjha7/master 

    Completed lab06, hockey stick and hockey stick with puck classes finished with three example drawings
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    2d16508 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4 from xgmak94/master 

    Added TicTacToeTable and FilledInTicTacToeTable, modified snowman, and SimpleGui1
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    554397f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6 from barasuishou/master 

    Added Ball and Pokeball classes, modified snowman, and SimpleGui1
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    020941d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #7 from menaiskander/master 

    Sword extends Blade
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    ac169b2 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8 from sarahdarwiche/master 

    Computer
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    305986f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #9 from nissayeva/master 

    Added Mushroom and MarioMushroom class
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    88f94c0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #10 from l-y-s/master 

    Finished Custom Drawings
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    f9e18e1 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #11 from vinlara/master 

    Pull Request for Lab06
    @bronhuston
    bronhuston committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    4452600 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2014

  1. Merge branch 'lab07branch' of github.com:UCSB-CS56-W14/CS56-W14-lab06… 

    … into lab07branch
    Natasha Issayeva committed Mar 7, 2014
    Configuration menu
    Copy the full SHA
    3bf065f View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2014

  1. Merge branch 'lab07branch' of github.com:UCSB-CS56-W14/CS56-W14-lab06… 

    … into lab07branch

create a sub-branch in order to create an animation
    @vinlara
    vinlara committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    8547033 View commit details
    Browse the repository at this point in the history

  2. simple Hourglass animation is working

    @vinlara
    vinlara committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    d1053f4 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2014

  1. Changed animation to scaling bigger and diagonal

    @vinlara
    vinlara committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    1312e43 View commit details
    Browse the repository at this point in the history

  2. animation of Face bouncing around screen

    Natasha Issayeva committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    fbfc32f View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2014

  1. Merge pull request #17 from vinlara/lab07branch 

    bronhuston Lab07branch Pull Request for Vincente Lara
    @kjorg50
    kjorg50 committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    12f4c63 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #16 from nissayeva/lab07branch 

    Lab07branch
    @kjorg50
    kjorg50 committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    23dddeb View commit details
    Browse the repository at this point in the history