Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/aframevr/aframe into link…
Browse files Browse the repository at this point in the history
…-size
  • Loading branch information
DougReeder committed Feb 14, 2020
2 parents 7610794 + 03a9a67 commit 40ad229
Show file tree
Hide file tree
Showing 50 changed files with 1,747 additions and 919 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ dist: trusty
language: node_js
addons:
firefox: 'latest'
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
chrome: stable

node_js:
- '11.6'
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
### 1.0.4 (Feb 5, 2020)

Bug fixes

### Fixes

* Reset `referenceSpace` and controllers list when entering / exiting VR (#4406) @AG-LucidWeb @Artyom17 @dmarcos
* Fix WebXR buttons mapping for Oculus Go controller @dmarcos
* Properly remove `selectstart` / `selectend` event listeners when XR session ends @DougReeder
* Apply handedness orientation directly to the hands model (#4388) @dbradleyfl @dala00 @dmarcos
* Set tracked-controls `armModel` default to false (#4405) @dmarcos
* Set camera entity `matrixAutoupdate` to false only for the WebXR case (#4383) @liewol @dmarcos
* Check if headset is connected when ignoring `mousedown` events (#4380) @AG-LucidWeb @dmarcos
* Get rid of invalid character in TRHEE build (#4428) @kennardconsulting @dmarcos

### Enhancements

* Add dithering property in materials component (#4433) @Firepal
* Add Magic Leap Controller Support @atarng-magicleap
* New high poly, low poly and toon styles for `hand-controls` @arturitu
* Listens to WebXR `selectstart` / `selectstart` and reemits as mousedown / mouseup. Simple screen input for AR experiences (fix #4407) @dmarcos
* Use full hash in dependencies to comply with pnpm @pleku
* Add color property to `hand-controls` @arturitu
* Docs improvements @d2s @ChicagoDev @dirkk0 @omgitsraven @dmarcos
* Add API to set WebXR far and near camera planes (#4387) @DougReeder


### 1.0.3 (Dec 30, 2019)

Bug fixes

### Fixes

* Add support for Gear VR controller over WebXR (@Artyom17, @dmarcos)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ and publishing now, remix the starter example on:
```html
<html>
<head>
<script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
</head>
<body>
<a-scene>
Expand All @@ -119,7 +119,7 @@ and publishing now, remix the starter example on:
```

With A-Frame's [entity-component
architecture](https://aframe.io/docs/1.0.3/introduction/entity-component-system.html), we can drop in community
architecture](https://aframe.io/docs/1.0.4/introduction/entity-component-system.html), we can drop in community
components from the ecosystem (e.g., ocean, physics) and plug them into our
objects straight from HTML:

Expand All @@ -128,7 +128,7 @@ objects straight from HTML:
```html
<html>
<head>
<script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-particle-system-component.min.js"></script>
<script src="https://unpkg.com/aframe-extras.ocean@%5E3.5.x/dist/aframe-extras.ocean.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/gradientsky.min.js"></script>
Expand Down Expand Up @@ -159,11 +159,11 @@ objects straight from HTML:

### Builds

To use the latest stable build of A-Frame, include [`aframe.min.js`](https://aframe.io/releases/1.0.3/aframe.min.js):
To use the latest stable build of A-Frame, include [`aframe.min.js`](https://aframe.io/releases/1.0.4/aframe.min.js):

```js
<head>
<script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
</head>
```

Expand Down
2 changes: 1 addition & 1 deletion dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ script below from the [jsdelivr CDN](https://www.jsdelivr.com/):
```html
<html>
<head>
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@6a34e66a072220dd022f082c62cda0ad01dfa037/dist/aframe-master.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@2a88795181f7f718d32c6ea9fe47404b51a4462c/dist/aframe-master.min.js"></script>
</head>
<body>
<a-scene>
Expand Down
Loading

0 comments on commit 40ad229

Please sign in to comment.