提交 16dea2c8 编写于 作者: J Jerome Etienne

Last commit before release

上级 72fa211d
# 1.5.5-dev # 1.5.5
- Fix cross domain issue with [https://webxr.io/augmented-website/](https://webxr.io/augmented-website/) - Fix cross domain issue with [https://webxr.io/augmented-website/](https://webxr.io/augmented-website/)
- reduced npm package size from 250mbyte to 3.5mbyte #256 (thanks @paztis) - reduced npm package size from 250mbyte to 3.5mbyte #256 (thanks @paztis)
......
...@@ -242,7 +242,6 @@ atom CHANGELOG.md ...@@ -242,7 +242,6 @@ atom CHANGELOG.md
# replace REVISION to the proper version, search/replace on the version string should do it # 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 atom three.js/src/threex/threex-artoolkitcontext.js package.json README.md
# Rebuild and minify everything - aka a-frame and three.js # Rebuild and minify everything - aka a-frame and three.js
make minify make minify
...@@ -256,7 +255,7 @@ git checkout master ...@@ -256,7 +255,7 @@ git checkout master
git merge dev git merge dev
# tag the release # tag the release
git tag 1.5.1 git tag 1.5.5
# push the tag on github # push the tag on github
git push origin --tags git push origin --tags
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
- merge to master - merge to master
- in demos/ and experiments/ avoid to have .html directly, move each experiments in its own folders
- make a nice examples of face tracking
- in threex.jsaruco - in threex.jsaruco
- fix path in examples - fix path in examples
- experiments with focal change - dat.gui to tune - experiments with focal change - dat.gui to tune
...@@ -12,8 +14,6 @@ ...@@ -12,8 +14,6 @@
- three.js/demos ? YES - three.js/demos ? YES
- http://127.0.0.1:8080/three.js/examples/multi-markers/examples/threex-screenasportal/ - http://127.0.0.1:8080/three.js/examples/multi-markers/examples/threex-screenasportal/
- multi-marker: make ar.js marker by default in the multi marker screen - multi-marker: make ar.js marker by default in the multi marker screen
- in demos/ and experiments/ avoid to have .html directly, move each experiments in its own folders
- make a nice examples of face tracking
- remove all the artoolkit in classname and filename - remove all the artoolkit in classname and filename
- just keep a layer for backward compatibility - just keep a layer for backward compatibility
......
...@@ -5251,7 +5251,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5251,7 +5251,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.5'
因为 它太大了无法显示 source diff 。你可以改为 查看blob
{ {
"name": "ar.js", "name": "ar.js",
"version": "1.5.1", "version": "1.5.5",
"description": "Efficient Augmented Reality for the Web", "description": "Efficient Augmented Reality for the Web",
"main": "three.js", "main": "three.js",
"scripts": { "scripts": {
......
...@@ -5251,7 +5251,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5251,7 +5251,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.5'
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -49361,7 +49361,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -49361,7 +49361,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.5'
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.5'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册