Permalink
Switch branches/tags
Nothing to show
Commits on Mar 14, 2016
  1. Merge pull request #14 from trollderiu/patch-1

    kig committed Mar 14, 2016
    Update FLARProcessor.js
  2. Merge pull request #15 from trollderiu/patch-2

    kig committed Mar 14, 2016
    Update NyARPickup.js
  3. Merge pull request #12 from youkinjoh/master

    kig committed Mar 14, 2016
    modified parameter of getUserMedia for new spec.
Commits on Jul 2, 2015
  1. Merge pull request #18 from duxan/custom-markers

    kig committed Jul 2, 2015
    Custom markers fix
  2. Custom markers fix

    duxan committed Jul 2, 2015
Commits on Jun 9, 2014
  1. Update NyARPickup.js

    trollderiu committed Jun 9, 2014
  2. Update FLARProcessor.js

    trollderiu committed Jun 9, 2014
Commits on Apr 1, 2014
Commits on Oct 24, 2012
  1. README: GPL clarification

    kig committed Oct 24, 2012
Commits on Feb 16, 2012
  1. ga tracker in mediaStream

    kig committed Feb 16, 2012
Commits on Jan 31, 2012
  1. Merge pull request #4 from GunioRobot/clean

    kig committed Jan 31, 2012
    Automatically Removed Whitespace
  2. Remove whitespace [WhitespaceBot]

    Gun.io Whitespace Robot committed Jan 31, 2012
Commits on Jan 27, 2012
  1. marker image

    kig committed Jan 27, 2012
Commits on Jan 23, 2012
  1. fix

    kig committed Jan 23, 2012
Commits on Mar 9, 2011
  1. update bundled files

    kig committed Mar 9, 2011
Commits on Mar 6, 2011
  1. index.html: add GitHub link

    Ilmari Heikkinen committed Mar 6, 2011
  2. index.html: add a link to Remixing Reality

    Ilmari Heikkinen committed Mar 6, 2011
  3. index.html: link to AR_simple_webgl.html

    Ilmari Heikkinen committed Mar 6, 2011
  4. Merge branch 'master' into gh-pages

    Ilmari Heikkinen committed Mar 6, 2011
  5. src/FLARParam.js: bring back the half-pixel tweaks

    Ilmari Heikkinen committed Mar 6, 2011
  6. Merge branch 'master' into gh-pages

    Ilmari Heikkinen committed Mar 6, 2011
  7. src/FLARParam.js: go back to a less hacky FLARParam.js

    Ilmari Heikkinen committed Mar 6, 2011
  8. index.html: fix html

    Ilmari Heikkinen committed Mar 6, 2011
  9. index.html: links to demos

    Ilmari Heikkinen committed Mar 6, 2011
  10. demos/AR_slideshow/swap_loop.ogg: add missing video

    Ilmari Heikkinen committed Mar 6, 2011
  11. demos/tests/output_4.ogg: add missing video file

    Ilmari Heikkinen committed Mar 6, 2011
Commits on Mar 3, 2011
  1. initial commit

    kig committed Mar 3, 2011