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

8af3ec40 · nicolo.carpignoli · 45ea143a · 8a5c6432 · 8af3ec40 · 8af3ec40
6 changed file
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
-<!-- 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**
--- 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


--- a/aframe/demos/demo-hatsune-miku/full-hatsune-original.html
+++ b/aframe/demos/demo-hatsune-miku/full-hatsune-original.html
@@ -13,11 +13,11 @@
    };
    */
    </script>
-    <script src="https://cdn.rawgit.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
-    <script src="https://cdn.rawgit.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
-    <script src="https://cdn.rawgit.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
-    <script src="https://cdn.rawgit.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
-    <script src='https://cdn.rawgit.com/takahirox/a-mmd/v1.0.2/build/a-mmd.js'></script>
+    <script src="https://raw.githack.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
+    <script src="https://raw.githack.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
+    <script src="https://raw.githack.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
+    <script src="https://raw.githack.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
+    <script src='https://raw.githack.com/takahirox/a-mmd/v1.0.2/build/a-mmd.js'></script>
  </head>
  <body>

@@ -28,17 +28,17 @@ https://github.com/mrdoob/three.js/tree/dev/examples/models/mmd#readme

    <a-scene antialias="true" outline stats>
      <a-assets>
-        <img id="sky" src="https://cdn.rawgit.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
+        <img id="sky" src="https://raw.githack.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
      </a-assets>

      <a-entity position="0 13 13">
      	<a-camera></a-camera>
      </a-entity>

-      <a-entity mmd="audio:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
+      <a-entity mmd="audio:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
                     audioDelayTime:5.333333333333333; afterglow:2.0;">
-        <a-entity mmd-model="model:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
-                             vmd:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
+        <a-entity mmd-model="model:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
+                             vmd:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
                             physics:true;"
                  shadow="cast:true"
                  position="0 0 0"></a-entity>

--- a/aframe/demos/demo-hatsune-miku/old-full-hatsune.html
+++ b/aframe/demos/demo-hatsune-miku/old-full-hatsune.html
@@ -12,11 +12,11 @@
    };
    */
    </script>
-    <script src="https://cdn.rawgit.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
-    <script src="https://cdn.rawgit.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
-    <script src="https://cdn.rawgit.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
-    <script src="https://cdn.rawgit.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
-   <script src="https://cdn.rawgit.com/takahirox/a-mmd/master/build/a-mmd.js"></script>
+    <script src="https://raw.githack.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
+    <script src="https://raw.githack.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
+    <script src="https://raw.githack.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
+    <script src="https://raw.githack.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
+   <script src="https://raw.githack.com/takahirox/a-mmd/master/build/a-mmd.js"></script>
   
   <!-- include aframe-ar.js -->
   <script src="../../build/aframe-ar.js"></script>
@@ -31,16 +31,16 @@ https://github.com/mrdoob/three.js/tree/dev/examples/models/mmd#readme

    <a-scene  embedded arjs='debug: false; sourceType: webcam;' antialias="true" outline stats>
      <a-assets>
-        <img id="sky" src="https://cdn.rawgit.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
+        <img id="sky" src="https://raw.githack.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
      </a-assets>

                <a-entity camera></a-entity>

 		<a-anchor>
-			<a-entity mmd="audio:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
+			<a-entity mmd="audio:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
     			                audioDelayTime:5.333333333333333; afterglow:2.0;">
-			<a-entity mmd-model="model:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
-        				vmd:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
+			<a-entity mmd-model="model:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
+        				vmd:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
                			physics:false;"
          			shadow="cast:true">
 			</a-entity>

--- a/aframe/demos/demo-hatsune-miku/old-hatsune.html
+++ b/aframe/demos/demo-hatsune-miku/old-hatsune.html
@@ -22,13 +22,13 @@
                        <!-- add an hatsune miku -->
                        <a-entity scale="0.08 0.08 0.08">
                                <a-entity mmd='outline: true' afterglow:2.0;>
-                                        <a-entity mmd-model="model:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
-                                        vmd:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;"
+                                        <a-entity mmd-model="model:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
+                                        vmd:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;"
                                        shadow="cast:true"
                                        position="0 0 0"></a-entity>
                                </a-entity>
 				<!-- add sounds -->
-      				<!-- <a-entity mmd="audio:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
+      				<!-- <a-entity mmd="audio:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
                     			audioDelayTime:5.333333333333333; afterglow:2.0;"> -->
                        </a-entity>


--- a/three.js/examples/arcode.html
+++ b/three.js/examples/arcode.html
@@ -11,7 +11,7 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>

        <!-- https://davidshimjs.github.io/qrcodejs/ -->
-        <script src='https://cdn.rawgit.com/davidshimjs/qrcodejs/gh-pages/qrcode.min.js'></script>
+        <script src='https://raw.githack.com/davidshimjs/qrcodejs/gh-pages/qrcode.min.js'></script>

        <!-- Include pdfMake - http://pdfmake.org/ -->
 	<script src='vendor/pdfMake/pdfmake.min.js'></script>