Skip to content

Commit 626dee3

Browse files
committed
Merge branch 'master' into dev
2 parents 9eb5e20 + 99bda00 commit 626dee3

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11

22
# AR.js - Augmented Reality on the Web
33

4-
<a href="https://xscode.com/nicolocarpignoli/AR.js">
5-
<img src="./AR-JS-banner.png" />
6-
</a>
7-
8-
---
94

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

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

17-
Welcome to the official repository!
12+
<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).
13+
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)!
14+
As for now, AR.js is still the only library providing Marker based and Location based AR features.</i>
1815

1916
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.
2017

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

2522
------
2623

27-
<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>
28-
29-
------
30-
3124

3225
### ⚡️AR.js has now an official Documentation!⚡️
3326
### Check it out: [AR.js Official Documentation](https://ar-js-org.github.io/AR.js-Docs/).

aframe/build/aframe-ar.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

three.js/build/ar.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)