aboutsummaryrefslogtreecommitdiff
path: root/PunchingBag
Commit message (Collapse)AuthorAge
* Merge branch 'master' of gitorious.org:punchingbag/punchingbagChristopher Baines2011-09-12
|\
| * Finished drawRectCentreunknown2011-09-09
| |
| * Added drawRectCorner, half way through drawRectCentreunknown2011-09-09
| |
* | Commit to move to other laptop due to technical dificulties.Christopher Baines2011-09-12
|/
* More changes, some wrong (mostly serial stuff).Christopher Baines2011-09-08
|
* Modified PunchingBagGUI to fix the sim bag on smaller screens (my laptop), ↵Christopher Baines2011-09-08
| | | | this needs to be fix properly so that the bag expands, but keeps its aspect ratio.
* Improved the look of the buttons, added new effect noise, added serial debug ↵Christopher Baines2011-09-08
| | | | | | (not finished or working yet) and made interface more flexible with scroll panels.
* Added clear button to the LEDControlPanel. TODO for Adam, make the ripple ↵Christopher Baines2011-09-08
| | | | | | effect start square around the button, then expand, instead of expanding from a single point to the top left.
* Major changes to the PunchingBag class and the PunchingBagGUI.Christopher Baines2011-09-08
|
* Merge branch 'master' of gitorious.org:punchingbag/punchingbagAdam Martindale2011-09-07
|\ | | | | | | | | Conflicts: PunchingBag/src/PunchingBag.java
| * More arduino stuff.Christopher Baines2011-09-07
| |
* | Merge branch 'master' of gitorious.org:punchingbag/punchingbagAdam Martindale2011-09-07
|\|
| * Added LEDMatrix.pde, this should be used to test the first matrix only! (at ↵Christopher Baines2011-09-07
| | | | | | | | the moment). Also added font, this can be used only with java 1.70 and an eclipse maintantice build?
* | Begun adding text effectAdam Martindale2011-09-07
|/
* Improved the Effect API, threading and display.Christopher Baines2011-09-05
|
* Finished off the listener implementation for the moment. Allowed the debug ↵Christopher Baines2011-09-04
| | | | | | screen to accept button presses and show leds. The Ripple still needs more work and more effects need implementing.
* 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
|/
* RXTXcomm jar and windows dllChristopher Baines2011-09-01
|
* New API for bag.Christopher Baines2011-08-24
|
* Initial commit of the java program.Christopher Baines2011-08-24