Merge branch 'master' of https://github.com/jeromeetienne/AR.js

# Conflicts: # README.md

Merge branch 'master' of https://github.com/jeromeetienne/AR.js
# Conflicts: # README.md
9b5f1f15 · nicolo.carpignoli · a8fbe8f7 · 0b55142c · 9b5f1f15 · 9b5f1f15
隐藏空白更改
内联并排

Showing with 10 addition and 3 deletion

CHANGELOG.md CHANGELOG.md +5 -2

README.md README.md +5 -1

未找到文件。
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
 # 1.7.7

- added events for camera initialization success/error
- use relative paths instead of remotes (i.e. `camera_para.data` not found bug)
+- added event when camera video stream has been appended to the DOM tree (`arjs-video-loaded`)
+
+# 1.7.5
+
+- added events for camera initialization success/error (`camera-init`, `camera-error`)
 - enhanced Debug UI style
 - minor documentation fixes


--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ More details about markers:
 * [Browser Support](#Browser-Support)
 * [Licenses](#Licenses)

-⚠️ *Be aware that most recent features are currently released on `dev` branch.*
+⚠️ *Please always give a look for new undocumented features on the [Changelog](https://github.com/jeromeetienne/AR.js/blob/master/CHANGELOG.md) until the documentation has been updated.*


 #  Get Started
@@ -79,7 +79,11 @@ More details about markers:
 <!doctype HTML>
 <html>
 <script src="https://aframe.io/releases/0.9.2/aframe.min.js"></script>
+<<<<<<< HEAD
 <script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.7/aframe/build/aframe-ar.js"></script>
+=======
+<script src="https://raw.githack.com/jeromeetienne/AR.js/1.7.6/aframe/build/aframe-ar.js"></script>
+>>>>>>> 665901ec0882894deff2700f166acc387a4a9ffc
  <body style='margin : 0px; overflow: hidden;'>
    <a-scene embedded arjs>
      <a-marker preset="hiro">