Merge branch 'master' into dev

jeromeetienne · Jul 22, 2019 · f91679c · f91679c
2 parents f70cda3 + 94fcab1
commit f91679c
Show file tree

Hide file tree

Showing 19 changed files with 1,169 additions and 1,126 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.7.3
+# 1.7.5
 
 - added events for camera initialization success/error
 - use relative paths instead of remotes (i.e. `camera_para.data` not found bug)

diff --git a/HOW_TO_RELEASE.md b/HOW_TO_RELEASE.md
@@ -3,11 +3,11 @@
 This one is mainly for [me](@jerome_etienne) to remember :)
 
 ```bash
-# Update CHANGELOG.md - remove the -dev into version
-atom CHANGELOG.md
-
-# replace REVISION to the proper version, search/replace on the version string should do it
-atom three.js/src/threex/threex-artoolkitcontext.js package.json README.md
+# Update following files:
+CHANGELOG.md
+three.js/src/threex/threex-artoolkitcontext.js
+package.json
+README.md
 
 # Rebuild and minify everything - aka a-frame and three.js
 make minify
@@ -22,15 +22,15 @@ git checkout master
 git merge dev
 
 # tag the release
-git tag 1.5.5
+git tag <tag>
 
 # push the tag on github
 git push origin --tags
 
 # push commits tag on github
 git push
 
-# update npm package.json
+# publish on NPM (only if have proper credentials)
 npm publish
 
 # Come back to dev branch

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -1,14 +1,21 @@
-<!-- Please don't delete this template or we'll close your issue -->
-<!-- All PRs should be done versus 'dev' branch -->
+<!-- Please, don't delete this template or we'll close your issue -->
+
+**⚠️ All PRs have to be done versus 'dev' branch, so be aware of that, or we'll close your issue ⚠️**
+
 **What kind of change does this PR introduce?**
 <!-- Can be a new feature, a bugfix, or refactoring, etc -->
+
 **Can it be referenced to an Issue? If so what is the issue # ?**
 
 **How can we test it?**
 <!-- All information can be found about our tests in https://github.com/jeromeetienne/AR.js/blob/master/test/TODO.md -->
 <!-- At the moment we don't explicitly require tests, because it's not streamlined yet -->
+
 **Summary**
 <!-- State here what problem the PR solves and what is the proposed solution -->
+
 **Does this PR introduce a breaking change?**
 
+**Please TEST your PR before proposing it. Specify here what device you have used for tests, version of OS and version of Browser**
+
 **Other information**
diff --git a/README.md b/README.md
@@ -17,12 +17,16 @@ Stuff is still moving fast, we have reached a good status though.
 An article has been published on [uploadvr](https://uploadvr.com/ar-js-efficient-augmented-reality-for-the-web/).
 So I wanted to publish this so people can try it and have fun with it :)
 
+🚀For more updated stuff about AR.js, new versions and more, you can follow [@nicolocarp](https://twitter.com/nicolocarp) and Watch this repo!
+
+
+**Key points**:
+
 - **Very Fast** : it runs efficiently even on phones - [60 fps on my 2 year-old phone](https://twitter.com/jerome_etienne/status/831333879810236421)!
 - **Web-based** : It is a pure web solution, so no installation required. Full javascript based on three.js + jsartoolkit5
 - **Open Source** : It is completely open source and free of charge!
 - **Standards** : It works on any phone with [webgl](http://caniuse.com/#feat=webgl) and [webrtc](http://caniuse.com/#feat=stream)
 
-[![AR.js 1.0 Video](https://cloud.githubusercontent.com/assets/252962/23441016/ab6900ce-fe17-11e6-971b-24614fb8ac0e.png)](https://youtu.be/0MtvjFg7tik)
 
 # Try it on Mobile
 
@@ -74,8 +78,8 @@ More details about markers:
 ```html
 <!doctype HTML>
 <html>
-<script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script>
-<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.3/aframe/build/aframe-ar.js"></script>
+<script src="https://aframe.io/releases/0.9.2/aframe.min.js"></script>
+<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.5/aframe/build/aframe-ar.js"></script>
   <body style='margin : 0px; overflow: hidden;'>
     <a-scene embedded arjs>
       <a-marker preset="hiro">