Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Mar 14, 2016

• Merge pull request #14 from trollderiu/patch-1

  Show description for 0181746
  kig

  committed
  0181746

  Copy full SHA for 0181746

• Merge pull request #15 from trollderiu/patch-2

  Show description for 0597977
  kig

  committed
  0597977

  Copy full SHA for 0597977

• Merge pull request #12 from youkinjoh/master

  Show description for 34ca85d
  kig

  committed
  34ca85d

  Copy full SHA for 34ca85d

Commits on Jul 2, 2015

• Merge pull request #18 from duxan/custom-markers

  Show description for f7379c4
  kig

  committed
  f7379c4

  Copy full SHA for f7379c4

• Custom markers fix

  duxan

  committed
  9b60061

  Copy full SHA for 9b60061

Commits on Jun 9, 2014

• Update NyARPickup.js

  oscar-gardiazabal

  committed
  cf01a1e

  Copy full SHA for cf01a1e

• Update FLARProcessor.js

  oscar-gardiazabal

  committed
  5f1cc4f

  Copy full SHA for 5f1cc4f

Commits on Apr 1, 2014

• modified parameter of getUserMedia for new spec.

  youkinjoh

  committed
  4a43eba

  Copy full SHA for 4a43eba

Commits on Oct 24, 2012

• README: GPL clarification

  kig

  committed
  47e6267

  Copy full SHA for 47e6267

Commits on Feb 16, 2012

• ga tracker in mediaStream

  kig

  committed
  8c2f15c

  Copy full SHA for 8c2f15c

Commits on Jan 31, 2012

• Merge pull request #4 from GunioRobot/clean

  Show description for 025fbb3
  kig

  committed
  025fbb3

  Copy full SHA for 025fbb3

• Remove whitespace [WhitespaceBot]

  

  Gun.io Whitespace Robot

  committed
  fea50ff

  Copy full SHA for fea50ff

Commits on Jan 27, 2012

• marker image

  kig

  committed
  b7d0403

  Copy full SHA for b7d0403

• Merge branch 'gh-pages' of github.com:kig/JSARToolKit

  kig

  committed
  417a530

  Copy full SHA for 417a530

• make slideshow example use local files, use MediaStream webcam

  kig

  committed
  d62a86c

  Copy full SHA for d62a86c

Commits on Jan 23, 2012

• fix

  kig

  committed
  6bb1936

  Copy full SHA for 6bb1936

Commits on Mar 9, 2011

• fix some bugs with method calls not prefixed with this.

  kig

  committed
  38ba344

  Copy full SHA for 38ba344

• update bundled files

  kig

  committed
  bd82f66

  Copy full SHA for bd82f66

Commits on Mar 6, 2011

• index.html: add GitHub link

  

  Ilmari Heikkinen

  committed
  eb8272b

  Copy full SHA for eb8272b

• index.html: add a link to Remixing Reality

  

  Ilmari Heikkinen

  committed
  7cb99ae

  Copy full SHA for 7cb99ae

• index.html: link to AR_simple_webgl.html

  

  Ilmari Heikkinen

  committed
  b382575

  Copy full SHA for b382575

• Merge branch 'master' into gh-pages

  

  Ilmari Heikkinen

  committed
  78430ce

  Copy full SHA for 78430ce

• src/FLARParam.js: bring back the half-pixel tweaks

  

  Ilmari Heikkinen

  committed
  4f27678

  Copy full SHA for 4f27678

• Merge branch 'master' into gh-pages

  

  Ilmari Heikkinen

  committed
  09ae939

  Copy full SHA for 09ae939

• src/FLARParam.js: go back to a less hacky FLARParam.js

  

  Ilmari Heikkinen

  committed
  47353d2

  Copy full SHA for 47353d2

• index.html: fix html

  

  Ilmari Heikkinen

  committed
  1a5dbec

  Copy full SHA for 1a5dbec

• index.html: links to demos

  

  Ilmari Heikkinen

  committed
  5149c71

  Copy full SHA for 5149c71

• demos/AR_slideshow/swap_loop.ogg: add missing video

  

  Ilmari Heikkinen

  committed
  928c2fa

  Copy full SHA for 928c2fa

• demos/tests/output_4.ogg: add missing video file

  

  Ilmari Heikkinen

  committed
  ef1682b

  Copy full SHA for ef1682b

Commits on Mar 3, 2011

• initial commit

  kig

  committed
  03cfc42

  Copy full SHA for 03cfc42