Merge pull request #1275 from ngokevin/0.2.0

v0.2.0
aframevr · Mar 25, 2016 · 1e0226e · 1e0226e
2 parents be08182 + 3c58594
commit 1e0226e
Show file tree

Hide file tree

Showing 8 changed files with 1,178 additions and 747 deletions.
diff --git a/dist/aframe-v0.2.0-rc1.js → dist/aframe-v0.2.0.js b/dist/aframe-v0.2.0-rc1.js → dist/aframe-v0.2.0.js
diff --git a/dist/aframe-v0.2.0-rc1.js.map → dist/aframe-v0.2.0.js.map b/dist/aframe-v0.2.0-rc1.js.map → dist/aframe-v0.2.0.js.map
diff --git a/dist/aframe-v0.2.0-rc1.min.js → dist/aframe-v0.2.0.min.js b/dist/aframe-v0.2.0-rc1.min.js → dist/aframe-v0.2.0.min.js
diff --git a/dist/aframe.js b/dist/aframe.js
diff --git a/dist/aframe.js.map b/dist/aframe.js.map
diff --git a/dist/aframe.min.js b/dist/aframe.min.js
diff --git a/examples/test-panoexplorer/index.html b/examples/test-panoexplorer/index.html
@@ -30,7 +30,7 @@
         <a-mixin id="click-animation" begin="click" easing="ease-in" attribute="scale"
                  fill="backwards" from="0.1 0.1 0.1" to="1 1 1" dur="150"></a-animation>
         <a-mixin id="fuse-animation" begin="fusing" easing="ease-in" attribute="scale"
-                 fill="forwards" from="1 1 1" to="0.1 0.1 0.1" dur="1500"></a-mixin>
+                 fill="backwards" from="1 1 1" to="0.1 0.1 0.1" dur="1500"></a-mixin>
       </a-assets>
 
       <!-- Camera + Cursor. -->

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aframe",
-  "version": "0.2.0-rc1",
+  "version": "0.2.0",
   "description": "Building blocks for the VR Web",
   "main": "dist/aframe.js",
   "scripts": {