aboutsummaryrefslogtreecommitdiff
path: root/PunchingBag/src
Commit message (Collapse)AuthorAge
* Resolved SetLEDChristopher Baines2011-09-02
|\ | | | | | | | | | | | | Merge branch 'master' of gitorious.org:punchingbag/punchingbag Conflicts: PunchingBag/src/PunchingBag.java
| * I dunno what we changed but it was important.Adam Martindale2011-09-02
| |
| * Finalized circleExpand, setLED check for legitimacy.Adam Martindale2011-09-02
| |
* | Inproved, but not yet completed listener system.Christopher Baines2011-09-02
|/
* Much improved Effect managementChristopher Baines2011-09-02
|
* Merged Adam's changes for the CircleExpand with my new effect class.Christopher Baines2011-09-02
|\ | | | | | | | | | | | | | | | | The CircleExpand class need to be checked. Merge branch 'master' of gitorious.org:punchingbag/punchingbag Conflicts: PunchingBag/src/PunchingBag.java
| * Renamed CirclePulsate class and added Draw EllipseAdam Martindale2011-09-02
| |
* | Implement an effect class to manage stopping and refreshing for the effects.Christopher Baines2011-09-02
|/
* Removed old SetLed function, changed Ripple class as result.Christopher Baines2011-09-02
|
* Fixed issues arrising from the merge.Christopher Baines2011-09-02
|
* Merge branch 'master' of git://gitorious.org/punchingbag/punchingbagAdam Martindale2011-09-02
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: PunchingBag/.classpath PunchingBag/bin/PunchingBag$Colour.class PunchingBag/bin/PunchingBag.class PunchingBag/bin/PunchingBagGUI$Ripple.class PunchingBag/bin/PunchingBagGUI.class PunchingBag/src/Arduino.java PunchingBag/src/PunchingBag.java PunchingBag/src/PunchingBagGUI.java
| * Inproved punching bag and general api.Christopher Baines2011-09-02
| |
* | Changed stuff. Like things.unknown2011-09-02
|/
* New API for bag.Christopher Baines2011-08-24
|
* Initial commit of the java program.Christopher Baines2011-08-24