Skip to content

Commit 1e4a121

Browse files
nicolocarpignolinicolocarpignoli
committed
Last commit before release
1 parent d1dcbca commit 1e4a121

File tree

11 files changed

+16
-10
lines changed

11 files changed

+16
-10
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 2.2.0
2+
3+
- it's now possible to track markers with white background and black shapes, using `labelingMode: white_region;` property on `arjs` component (thanks to @umutto)
4+
- in location based is now possible to simulate altitude, longitude and latitude for user position (thanks to @cmcfadden)
5+
- default package script for jsdelvr (thanks to @benalfree)
6+
17
# 2.1.8
28

39
- handle y position (height) of content in Location Based, using `position` property of A-FRAME

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ You can also use GeoAR.js **without** the script, adding `gps-entity-place` enti
127127
<!doctype HTML>
128128
<html>
129129
<script src="https://aframe.io/releases/1.0.0/aframe.min.js"></script>
130-
<script src="https://raw.githack.com/jeromeetienne/AR.js/2.1.8/aframe/build/aframe-ar.js"></script>
130+
<script src="https://raw.githack.com/jeromeetienne/AR.js/2.2.0/aframe/build/aframe-ar.js"></script>
131131
<body style='margin : 0px; overflow: hidden;'>
132132
<a-scene embedded arjs>
133133
<a-marker preset="hiro">

‎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.

‎aframe/build/aframe-ar.min.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.

‎package-lock.json

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

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ar.js",
3-
"version": "2.1.8",
3+
"version": "2.2.0",
44
"description": "Efficient Augmented Reality for the Web",
55
"main": "./aframe/build/aframe-ar.min.js",
66
"scripts": {

‎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.

‎three.js/build/ar.lean.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.lean.min.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.min.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)