Permalink
Switch branches/tags
Nothing to show
Commits on Mar 30, 2012
  1. Merge pull request #10 from danielbwatson/demo

    danielbwatson committed Mar 30, 2012
    This is the lightning talk demo video used at the JPR.
Commits on Mar 27, 2012
  1. Merge pull request #9 from danielbwatson/aspectFix

    danielbwatson committed Mar 27, 2012
    Fixed face aspect ratio stretching.
  2. fix resize

    brianmgray committed Mar 27, 2012
  3. Merge pull request #8 from danielbwatson/doubleclick

    danielbwatson committed Mar 27, 2012
    Added double click to swap video slices.
  4. Merge pull request #7 from danielbwatson/controls

    danielbwatson committed Mar 27, 2012
    Merged in the code from controls.html.
  5. Merge in drag and resize

    brianmgray committed Mar 27, 2012
  6. Merge fixes

    brianmgray committed Mar 27, 2012
  7. Fix background in title

    brianmgray committed Mar 27, 2012
  8. Merge pull request #6 from danielbwatson/call_alpha

    danielbwatson committed Mar 27, 2012
    Called the removeFrameBackground code from the alpha code.
Commits on Mar 26, 2012
  1. Merge pull request #5 from eirbjo/master

    eirbjo committed Mar 26, 2012
    Transparent video in Javascript
  2. Transparent video in javascript

    eirbjo committed Mar 26, 2012
  3. Added player controls.

    KristerS committed Mar 26, 2012
  4. Added player controls.

    KristerS committed Mar 26, 2012
  5. Initial pass at layout

    brianmgray committed Mar 26, 2012
  6. Setup steal

    brianmgray committed Mar 26, 2012
  7. Merge pull request #4 from eirbjo/master

    eirbjo committed Mar 26, 2012
    Java code to create merged video
  8. Merge pull request #3 from danielbwatson/master

    danielbwatson committed Mar 26, 2012
    Render two canvas slices from one video
  9. Merge pull request #2 from danielbwatson/master

    danielbwatson committed Mar 26, 2012
    Bare bones page playing a video.
  10. Merge pull request #1 from danielbwatson/master

    danielbwatson committed with brianmgray Mar 26, 2012
    Added a gradle build file
  11. Merge pull request #1 from danielbwatson/master

    danielbwatson committed Mar 26, 2012
    Added a gradle build file
  12. Code used to produce the merged video. Commented out so it won't brea…

    eirbjo committed Mar 26, 2012
    …k jetty:run for people not havning the xuggler library