Skip to content

Commit

Permalink
Merge branch 'feature/aframe-0.7.0-compat'
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenvergenz committed Nov 29, 2017
2 parents ddc3633 + e7b098c commit d7eceda
Show file tree
Hide file tree
Showing 116 changed files with 1,172 additions and 7,478 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you choose, you can apply for AltspaceVR developer privileges [here](http://d
- **The AltspaceVR [SDK Wiki] - User-contributed tips and tricks**
- **[Local Dev Setup] - Instructions for setting up a local dev environment**
- **[App Guidelines] - Suggestions for building apps that work well in Altspace and Gear VR**
- **[Slack] - Chat with other members of the community and AltspaceVR devs. [Register for Slack](http://altspacevr-slackin.herokuapp.com)**
- **[Slack](https://developer.altvr.com/slack) - Chat with other members of the community and AltspaceVR devs.**


## altspace.js
Expand Down Expand Up @@ -81,7 +81,7 @@ $ netsh interface portproxy add v4tov4 protocol=tcp listenport=9222 listenaddres

## Graphics Feature Support

AltspaceVR supports Three.js versions r73, r74, r76, and r84. r84 is recommended. A-Frame version 0.3.0 is currently the only version supported.
AltspaceVR supports Three.js versions r73, r74, r76, and r84. r84 is recommended. A-Frame versions 0.3.0 and 0.7.0 are the only versions tested and known to work, though others may as well.

**Currently supported:**
* Object3D transformation and hierarchy
Expand Down Expand Up @@ -138,7 +138,7 @@ Altspace's browser is based on Chromium version 40.

[Three.js]: http://threejs.org/
[Three.js Reference]: https://threejs.org/docs/
[A-Frame]: https://aframe.io/docs/0.3.0/introduction/
[A-Frame]: https://aframe.io/docs/0.7.0/introduction/

[SDK Wiki]: https://github.com/AltspaceVR/AltspaceSDK/wiki
[GitHub Issues]: https://github.com/AltspaceVR/AltspaceSDK/issues
Expand All @@ -148,7 +148,6 @@ Altspace's browser is based on Chromium version 40.
[Local Dev Setup]: https://developer.altvr.com/local-dev/
[App Guidelines]: https://slack-files.com/T0B35FQCT-F0LED1QC9-299cb2300f
[Getting Started]: https://developer.altvr.com/get-started/
[Slack]: https://altspacevrsdk.slack.com

---

Expand Down
7 changes: 3 additions & 4 deletions README.template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you choose, you can apply for AltspaceVR developer privileges [here](http://d
- **The AltspaceVR [SDK Wiki] - User-contributed tips and tricks**
- **[Local Dev Setup] - Instructions for setting up a local dev environment**
- **[App Guidelines] - Suggestions for building apps that work well in Altspace and Gear VR**
- **[Slack] - Chat with other members of the community and AltspaceVR devs. [Register for Slack](http://altspacevr-slackin.herokuapp.com)**
- **[Slack](https://developer.altvr.com/slack) - Chat with other members of the community and AltspaceVR devs.**


## altspace.js
Expand Down Expand Up @@ -81,7 +81,7 @@ $ netsh interface portproxy add v4tov4 protocol=tcp listenport=9222 listenaddres

## Graphics Feature Support

AltspaceVR supports Three.js versions r73, r74, r76, and r84. r84 is recommended. A-Frame version 0.3.0 is currently the only version supported.
AltspaceVR supports Three.js versions r73, r74, r76, and r84. r84 is recommended. A-Frame versions 0.3.0 and 0.7.0 are the only versions tested and known to work, though others may as well.

**Currently supported:**
* Object3D transformation and hierarchy
Expand Down Expand Up @@ -138,7 +138,7 @@ Altspace's browser is based on Chromium version 40.

[Three.js]: http://threejs.org/
[Three.js Reference]: https://threejs.org/docs/
[A-Frame]: https://aframe.io/docs/0.3.0/introduction/
[A-Frame]: https://aframe.io/docs/0.7.0/introduction/

[SDK Wiki]: https://github.com/AltspaceVR/AltspaceSDK/wiki
[GitHub Issues]: https://github.com/AltspaceVR/AltspaceSDK/issues
Expand All @@ -148,7 +148,6 @@ Altspace's browser is based on Chromium version 40.
[Local Dev Setup]: https://developer.altvr.com/local-dev/
[App Guidelines]: https://slack-files.com/T0B35FQCT-F0LED1QC9-299cb2300f
[Getting Started]: https://developer.altvr.com/get-started/
[Slack]: https://altspacevrsdk.slack.com

---

Expand Down
Loading

0 comments on commit d7eceda

Please sign in to comment.