Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: artoolkitx/artoolkitx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ceytho/artoolkitx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 11 files changed
  • 1 contributor

Commits on Oct 24, 2018

  1. Android : Add more linkages via JNI and functions for 2D Tracking

    @ceytho
    ceytho committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    23b8884 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. Asynchronous detection for 2D Trackables (C++11) 

    Trackable removal functions in ARController
    @ceytho
    ceytho committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    031845d View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2018

  1. Add the possibility to set a custom GLSurfaceView 

    This will allow you to have more control on the GLView, for instance to catch TouchEvents.
    @ceytho
    ceytho committed Nov 13, 2018
    Configuration menu
    Copy the full SHA
    18a4f72 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Clear tracked marker count when deleting trackable 

    Thanks to GilbertoGojira for the tip.
    @ceytho
    ceytho authored Dec 17, 2018
    Configuration menu
    Copy the full SHA
    549240d View commit details
    Browse the repository at this point in the history
Loading