Merge branch 'master' into feature/native-gltf-component

AltspaceVR · Feb 8, 2018 · 57cc13e · 57cc13e
2 parents 86c3ac6 + cb87f1e
commit 57cc13e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -34,11 +34,11 @@ Many APIs are present in the client without loading `altspace.js`, but please st
 
 The version baked into the altspace.js script will determine which version of the entire SDK  the client will provide your app. This means that if we make any breaking internal changes to things like rendering or cursor events, and you are using an older version of `altspace.js`, we will try to return legacy behavior appropriate to your version of `altspace.js`. Versioning will follow [SEMVER](http://semver.org/) as closely as possible. Details for each version can be found in the [Release Notes](https://github.com/AltspaceVR/AltspaceSDK/releases).
 
-**Latest Version: v2.7.3 -- [See Changes](https://github.com/AltspaceVR/AltspaceSDK/releases/tag/v2.7.3)**
+**Latest Version: v2.7.4 -- [See Changes](https://github.com/AltspaceVR/AltspaceSDK/releases/tag/v2.7.4)**
 
 Include the latest version of the SDK in your app with:
 
-`<script src="https://sdk.altvr.com/libs/altspace.js/2.7.3/altspace.min.js"></script>`
+`<script src="https://sdk.altvr.com/libs/altspace.js/2.7.4/altspace.min.js"></script>`
 
 If you use npm, you can install altspace.js with:
 

diff --git a/dist/altspace.js b/dist/altspace.js
@@ -501,7 +501,7 @@ var AltspaceTrackedControls = (function (AFrameComponent$$1) {
 * <head>
 *   <title>My A-Frame Scene</title>
 *   <script src="https://aframe.io/releases/0.7.0/aframe.min.js"></script>
-*   <script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.3/dist/altspace.min.js"></script>
+*   <script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.4/dist/altspace.min.js"></script>
 * </head>
 * <body>
 *   <a-scene altspace>
@@ -3128,7 +3128,7 @@ var Visible = (function (AFrameComponent$$1) {
 *   <head>
 *     <title>My A-Frame Scene</title>
 *     <script src="https://aframe.io/releases/0.7.0/aframe.min.js"></script>
-*     <script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.3/dist/altspace.min.js"></script>
+*     <script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.4/dist/altspace.min.js"></script>
 *   </head>
 *   <body>
 *     <a-scene altspace>
@@ -6396,7 +6396,7 @@ var utilities_lib = Object.freeze({
 if(!Object.isFrozen(window.altspace))
 	{ Object.assign(window.altspace, {components: {}, utilities: {}, inClient: false}); }
 
-var version = '2.7.3';
+var version = '2.7.4';
 if (window.altspace.requestVersion) {
 	window.altspace.requestVersion(version);
 }

diff --git a/dist/altspace.min.js b/dist/altspace.min.js
diff --git a/doc/aframe/index.html b/doc/aframe/index.html
@@ -73,7 +73,7 @@ <h2>Quick Start</h2><p>This is a fully functional example of what A-Frame code l
 <pre class="prettyprint source lang-html"><code>&lt;!DOCTYPE html>
 &lt;html>&lt;head>
 &lt;script src=&quot;https://aframe.io/releases/0.7.0/aframe.min.js&quot;>&lt;/script>
-&lt;script src=&quot;https://sdk.altvr.com/libs/altspace.js/2.7.3/altspace.min.js&quot;>&lt;/script>
+&lt;script src=&quot;https://sdk.altvr.com/libs/altspace.js/2.7.4/altspace.min.js&quot;>&lt;/script>
 &lt;script>
 
 // an example custom component, that will change the color when clicked

diff --git a/doc/aframe/module-altspace_components.altspace.html b/doc/aframe/module-altspace_components.altspace.html
@@ -134,7 +134,7 @@ <h2>
 
     <h5>Example</h5>
 
-    <pre class="prettyprint"><code>&lt;head>  &lt;title>My A-Frame Scene&lt;/title>  &lt;script src="https://aframe.io/releases/0.7.0/aframe.min.js">&lt;/script>  &lt;script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.3/dist/altspace.min.js">&lt;/script>&lt;/head>&lt;body>  &lt;a-scene altspace>    &lt;a-entity geometry="primitive: box" material="color: #C03546">&lt;/a-entity>  &lt;/a-scene>&lt;/body></code></pre>
+    <pre class="prettyprint"><code>&lt;head>  &lt;title>My A-Frame Scene&lt;/title>  &lt;script src="https://aframe.io/releases/0.7.0/aframe.min.js">&lt;/script>  &lt;script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.4/dist/altspace.min.js">&lt;/script>&lt;/head>&lt;body>  &lt;a-scene altspace>    &lt;a-entity geometry="primitive: box" material="color: #C03546">&lt;/a-entity>  &lt;/a-scene>&lt;/body></code></pre>
 
 
 

diff --git a/doc/aframe/module-altspace_components.html b/doc/aframe/module-altspace_components.html
@@ -136,7 +136,7 @@ <h1 class="page-title">altspace/components</h1>
 
     <h5>Example</h5>
 
-    <pre class="prettyprint"><code>&lt;html>  &lt;head>    &lt;title>My A-Frame Scene&lt;/title>    &lt;script src="https://aframe.io/releases/0.7.0/aframe.min.js">&lt;/script>    &lt;script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.3/dist/altspace.min.js">&lt;/script>  &lt;/head>  &lt;body>    &lt;a-scene altspace>      &lt;a-entity geometry="primitive: box" material="color: #C03546">&lt;/a-entity>    &lt;/a-scene>  &lt;/body>&lt;/html></code></pre>
+    <pre class="prettyprint"><code>&lt;html>  &lt;head>    &lt;title>My A-Frame Scene&lt;/title>    &lt;script src="https://aframe.io/releases/0.7.0/aframe.min.js">&lt;/script>    &lt;script src="https://cdn.rawgit.com/AltspaceVR/AltspaceSDK/v2.7.4/dist/altspace.min.js">&lt;/script>  &lt;/head>  &lt;body>    &lt;a-scene altspace>      &lt;a-entity geometry="primitive: box" material="color: #C03546">&lt;/a-entity>    &lt;/a-scene>  &lt;/body>&lt;/html></code></pre>
 
 
 

diff --git a/doc/index.html b/doc/index.html
@@ -23,9 +23,9 @@ <h2 id="altspace-js">altspace.js</h2>
 <p><code>altspace.js</code> should be included whenever you use the SDK. It contains core utilities and APIs, and is useful both inside and outside of the client.</p>
 <p>Many APIs are present in the client without loading <code>altspace.js</code>, but please still include it, as this may change in the future.</p>
 <p>The version baked into the altspace.js script will determine which version of the entire SDK  the client will provide your app. This means that if we make any breaking internal changes to things like rendering or cursor events, and you are using an older version of <code>altspace.js</code>, we will try to return legacy behavior appropriate to your version of <code>altspace.js</code>. Versioning will follow <a href="http://semver.org/">SEMVER</a> as closely as possible. Details for each version can be found in the <a href="https://github.com/AltspaceVR/AltspaceSDK/releases">Release Notes</a>.</p>
-<p><strong>Latest Version: v2.7.3 -- <a href="https://github.com/AltspaceVR/AltspaceSDK/releases/tag/v2.7.3">See Changes</a></strong></p>
+<p><strong>Latest Version: v2.7.4 -- <a href="https://github.com/AltspaceVR/AltspaceSDK/releases/tag/v2.7.4">See Changes</a></strong></p>
 <p>Include the latest version of the SDK in your app with:</p>
-<p><code>&lt;script src=&quot;https://sdk.altvr.com/libs/altspace.js/2.7.3/altspace.min.js&quot;&gt;&lt;/script&gt;</code></p>
+<p><code>&lt;script src=&quot;https://sdk.altvr.com/libs/altspace.js/2.7.4/altspace.min.js&quot;&gt;&lt;/script&gt;</code></p>
 <p>If you use npm, you can install altspace.js with:</p>
 <p><code>npm install altspace</code></p>
 <h2 id="sdk-feature-overview">SDK Feature Overview</h2>

diff --git a/doc/js/index.html b/doc/js/index.html
@@ -85,7 +85,7 @@ <h2>Quick Start</h2><p>This is a fully functional example of what Three.js code
 &lt;html lang=en>
     &lt;head>
         &lt;script src=&quot;https://cdn.rawgit.com/mrdoob/three.js/r84/build/three.js&quot;>&lt;/script>
-        &lt;script src=&quot;https://sdk.altvr.com/libs/altspace.js/2.7.3/altspace.min.js&quot;>&lt;/script>
+        &lt;script src=&quot;https://sdk.altvr.com/libs/altspace.js/2.7.4/altspace.min.js&quot;>&lt;/script>
     &lt;/head>
     &lt;body>
         &lt;script>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "altspace",
   "author": "AltspaceVR",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AltspaceVR/AltspaceSDK.git"