Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
kalwalt committed Mar 8, 2022
2 parents 9eb5e20 + 99bda00 commit 626dee3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@

# AR.js - Augmented Reality on the Web

<a href="https://xscode.com/nicolocarpignoli/AR.js">
<img src="./AR-JS-banner.png" />
</a>

---

[![Build Status](https://travis-ci.org/jeromeetienne/AR.js.svg?branch=master)](https://travis-ci.org/jeromeetienne/AR.js)
[![Gitter chat](https://badges.gitter.im/AR-js/Lobby.png)](https://gitter.im/AR-js/Lobby)
Expand All @@ -14,7 +9,9 @@

AR.js is a lightweight library for Augmented Reality on the Web, coming with features like Image Tracking, Location-based AR and Marker tracking.

Welcome to the official repository!
<i><b>30/12/21 Update:</b> There is now also a brand new OSS Web AR JS library around, called [MindAR](https://github.com/hiukim/mind-ar-js).
If you need a great Image tracking feature (also multiple image tracking) and Face tracking, [go check it out](https://github.com/hiukim/mind-ar-js)!
As for now, AR.js is still the only library providing Marker based and Location based AR features.</i>

This project has been created by [@jeromeetienne](https://github.com/jeromeetienne), previously managed by Nicolò Carpignoli and it is now maintained by the AR.js org.

Expand All @@ -24,10 +21,6 @@ Logo is courtesy of <a href="https://twitter.com/viralinfo"> Simon Poulter </a>.

------

<h2>You can get paid support and new features for AR.js. Check <a href="https://xscode.com/nicolocarpignoli/AR.js"> this link. </a></h2>

------


### ⚡️AR.js has now an official Documentation!⚡️
### Check it out: [AR.js Official Documentation](https://ar-js-org.github.io/AR.js-Docs/).
Expand Down
2 changes: 1 addition & 1 deletion aframe/build/aframe-ar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion three.js/build/ar.js

Large diffs are not rendered by default.

0 comments on commit 626dee3

Please sign in to comment.