Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianpeiris
brianpeiris committed Dec 22, 2016
1 parent 26b6630 commit 8118ca8
Show file tree
Hide file tree
Showing 29 changed files with 840 additions and 712 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This is a fully functional example of what A-Frame code looks like.
<!DOCTYPE html>
<html><head>
<script src="https://aframe.io/releases/0.3.0/aframe.min.js"></script>
<script src="https://cdn.rawgit.com/AltspaceVR/aframe-altspace-component/v1.2.0/dist/aframe-altspace-component.min.js"></script>
<script src="https://cdn.rawgit.com/AltspaceVR/aframe-altspace-component/v1.3.0/dist/aframe-altspace-component.min.js"></script>
<script>
// an example custom component, that will change the color when clicked
Expand Down
248 changes: 127 additions & 121 deletions dist/aframe-altspace-component.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
* <head>
* <title>My A-Frame Scene</title>
* <script src="https://aframe.io/releases/0.3.0/aframe.min.js"></script>
* <script src="https://cdn.rawgit.com/AltspaceVR/aframe-altspace-component/v1.1.1/dist/aframe-altspace-component.min.js"></script>
* <script src="https://cdn.rawgit.com/AltspaceVR/aframe-altspace-component/v1.3.0/dist/aframe-altspace-component.min.js"></script>
* </head>
* <body>
* <a-scene altspace>
Expand All @@ -96,7 +96,7 @@
* </body>
*/
AFRAME.registerComponent('altspace', {
version: '1.1.1',
version: '1.3.0',
schema: {
usePixelScale: { type: 'boolean', default: 'false'},
verticalAlign: { type: 'string', default: 'middle'},
Expand Down Expand Up @@ -679,10 +679,15 @@
* octave down, and 2 is one octave up.
* @prop {number} minDistance=1 - Inside this distance in meters,
* the sound volume is at full volume.
* @prop {number} maxDistance=12 - Beyond this distance in meters, the sound
* will rapidly fall off to silence.
* @prop {number} maxDistance=12 - If rolloff is 'logarithmic', the sound will stop attenuating at this distance.
* If rolloff is 'linear' or 'cosine', the sound will be silent at this distance.
* @prop {string} rolloff='logarithmic' - Set this to 'linear' or 'cosine' if you want to cut sounds off at a
* maxDistance.
*/
/**
* Fired when a sound has loaded and is ready to be played
* @event native.n-sound#n-sound-loaded
*/
AFRAME.registerComponent('n-sound', {
init: function () {
var src = this.data.src;
Expand Down Expand Up @@ -755,6 +760,7 @@
pitch: { type: 'float', default: 1 },
minDistance: { type: 'float', default: 1 },
maxDistance: { type: 'float', default: 12 },
rolloff: { type: 'string', default: 'logarithmic' },
}
});

Expand Down Expand Up @@ -782,64 +788,64 @@
* @enum architecture
* @memberof resources
*
* @prop ceiling-2w-2l
* @prop ceiling-4w-4l
* @prop ceiling-4w-4l
* @prop ceiling-skylight-4w-4l
* @prop ceiling-skylight-corner-2w-2l
* @prop ceiling-skylight-edge-2w
* @prop ceiling-skylight-edge-4w
* @prop ceiling-skylight-filler-4w-4l-2
* @prop ceiling-skylight-filler-4w-4l
* @prop ceiling-slice-concave-2r
* @prop ceiling-slice-concave-4r
* @prop ceiling-slice-convex-2r
* @prop ceiling-slice-convex-4r
* @prop door-4w-4h
* @prop floor-2w-2l
* @prop floor-2w-4l
* @prop floor-4w-2l
* @prop floor-4w-4l
* @prop floor-slice-concave-2r
* @prop floor-slice-concave-4r
* @prop floor-slice-convex-2r
* @prop floor-slice-convex-4r
* @prop railing-2l
* @prop railing-4l
* @prop railing-curve-concave-2r
* @prop wall-2w-4h
* @prop wall-4w-4h
* @prop wall-base-2w
* @prop wall-base-4w
* @prop wall-base-curve-concave-2r
* @prop wall-base-curve-concave-4r
* @prop wall-base-curve-convex-2r
* @prop wall-base-curve-convex-4r
* @prop wall-bulkhead-2w
* @prop wall-bulkhead-4w
* @prop wall-bulkhead-curve-concave-2r
* @prop wall-bulkhead-curve-concave-4r
* @prop wall-bulkhead-curve-convex-2r
* @prop wall-bulkhead-curve-convex-4r
* @prop wall-curve-concave-2r-4h
* @prop wall-curve-concave-4r-4h
* @prop wall-curve-convex-2r-4h
* @prop wall-curve-convex-4r-4h
* @prop wall-curve-window-concave-4r-4h
* @prop wall-curve-window-concave-filler-4r-4h
* @prop wall-curve-window-gap-concave-4r-4h
* @prop wall-curve-window-gap-end-l-concave-4r-4h
* @prop wall-curve-window-gap-end-r-concave-4r-4h
* @prop wall-filler-corner-inner-4h
* @prop wall-filler-corner-outer-4h
* @prop wall-window-4w-4h
* @prop wall-window-filler-2
* @prop wall-window-gap-2w-4h
* @prop wall-window-gap-4w-4h
* @prop wall-window-gap-end-l-2w-4h
* @prop wall-window-gap-end-l-4w-4h
* @prop wall-window-gap-end-r-2w-4h
* @prop wall-window-gap-end-r-4w-4h
* @prop architecture/ceiling-2w-2l
* @prop architecture/ceiling-4w-4l
* @prop architecture/ceiling-4w-4l
* @prop architecture/ceiling-skylight-4w-4l
* @prop architecture/ceiling-skylight-corner-2w-2l
* @prop architecture/ceiling-skylight-edge-2w
* @prop architecture/ceiling-skylight-edge-4w
* @prop architecture/ceiling-skylight-filler-4w-4l-2
* @prop architecture/ceiling-skylight-filler-4w-4l
* @prop architecture/ceiling-slice-concave-2r
* @prop architecture/ceiling-slice-concave-4r
* @prop architecture/ceiling-slice-convex-2r
* @prop architecture/ceiling-slice-convex-4r
* @prop architecture/door-4w-4h
* @prop architecture/floor-2w-2l
* @prop architecture/floor-2w-4l
* @prop architecture/floor-4w-2l
* @prop architecture/floor-4w-4l
* @prop architecture/floor-slice-concave-2r
* @prop architecture/floor-slice-concave-4r
* @prop architecture/floor-slice-convex-2r
* @prop architecture/floor-slice-convex-4r
* @prop architecture/railing-2l
* @prop architecture/railing-4l
* @prop architecture/railing-curve-concave-2r
* @prop architecture/wall-2w-4h
* @prop architecture/wall-4w-4h
* @prop architecture/wall-base-2w
* @prop architecture/wall-base-4w
* @prop architecture/wall-base-curve-concave-2r
* @prop architecture/wall-base-curve-concave-4r
* @prop architecture/wall-base-curve-convex-2r
* @prop architecture/wall-base-curve-convex-4r
* @prop architecture/wall-bulkhead-2w
* @prop architecture/wall-bulkhead-4w
* @prop architecture/wall-bulkhead-curve-concave-2r
* @prop architecture/wall-bulkhead-curve-concave-4r
* @prop architecture/wall-bulkhead-curve-convex-2r
* @prop architecture/wall-bulkhead-curve-convex-4r
* @prop architecture/wall-curve-concave-2r-4h
* @prop architecture/wall-curve-concave-4r-4h
* @prop architecture/wall-curve-convex-2r-4h
* @prop architecture/wall-curve-convex-4r-4h
* @prop architecture/wall-curve-window-concave-4r-4h
* @prop architecture/wall-curve-window-concave-filler-4r-4h
* @prop architecture/wall-curve-window-gap-concave-4r-4h
* @prop architecture/wall-curve-window-gap-end-l-concave-4r-4h
* @prop architecture/wall-curve-window-gap-end-r-concave-4r-4h
* @prop architecture/wall-filler-corner-inner-4h
* @prop architecture/wall-filler-corner-outer-4h
* @prop architecture/wall-window-4w-4h
* @prop architecture/wall-window-filler-2
* @prop architecture/wall-window-gap-2w-4h
* @prop architecture/wall-window-gap-4w-4h
* @prop architecture/wall-window-gap-end-l-2w-4h
* @prop architecture/wall-window-gap-end-l-4w-4h
* @prop architecture/wall-window-gap-end-r-2w-4h
* @prop architecture/wall-window-gap-end-r-4w-4h
*/

/**
Expand All @@ -848,15 +854,15 @@
* @enum effects
* @memberof resources
*
* @prop explosion - A particle system with a central flash, then debris flying outward.
* @prop effects/explosion - A particle system with a central flash, then debris flying outward.
* This is a non-looping effect.
* @prop fire - An animated fire particle, suitable for a torch.
* @prop fire-trail - Fire that trails the entity through space as it moves. Only is visible while an object is in motion
* @prop fireworks - A compound particle system that shoots up from the entity,
* @prop effects/fire - An animated fire particle, suitable for a torch.
* @prop effects/fire-trail - Fire that trails the entity through space as it moves. Only is visible while an object is in motion
* @prop effects/fireworks - A compound particle system that shoots up from the entity,
* explodes into colored sparks, then transitions to gold streamers.
* @prop smoke - Billowing smoke particle system.
* @prop sparkler - Emits sparks in all directions
* @prop steam - Small white steam rising upwards
* @prop effects/smoke - Billowing smoke particle system.
* @prop effects/sparkler - Emits sparks in all directions
* @prop effects/steam - Small white steam rising upwards
*/

/**
Expand All @@ -865,14 +871,14 @@
* @enum interactables
* @memberof resources
*
* @prop basketball
* @prop bowlingball
* @prop bowling-pin
* @prop box
* @prop coin
* @prop gem
* @prop ring
* @prop soccerball
* @prop interactables/basketball
* @prop interactables/bowlingball
* @prop interactables/bowling-pin
* @prop interactables/box
* @prop interactables/coin
* @prop interactables/gem
* @prop interactables/ring
* @prop interactables/soccerball
*/

/**
Expand All @@ -881,13 +887,13 @@
* @enum objects
* @memberof resources
*
* @prop basketball-hoop
* @prop coin
* @prop cup
* @prop gem
* @prop hoop
* @prop ring
* @prop target-archery
* @prop objects/basketball-hoop
* @prop objects/coin
* @prop objects/cup
* @prop objects/gem
* @prop objects/hoop
* @prop objects/ring
* @prop objects/target-archery
*/

/**
Expand All @@ -896,22 +902,22 @@
* @enum pipes
* @memberof resources
*
* @prop pipe-full-cap-1d
* @prop pipe-full-cross-1d
* @prop pipe-full-elbow-1d
* @prop pipe-full-fork-1d
* @prop pipe-full-straight-1d-1l
* @prop pipe-full-straight-1d-2l
* @prop pipe-full-straight-1d-4l
* @prop pipe-full-tee-1d
* @prop pipe-half-cap-1d
* @prop pipe-half-cross-1d
* @prop pipe-half-elbow-1d
* @prop pipe-half-fork-1d
* @prop pipe-half-straight-1d-1l
* @prop pipe-half-straight-1d-2l
* @prop pipe-half-straight-1d-4l
* @prop pipe-half-tee-1d
* @prop pipes/pipe-full-cap-1d
* @prop pipes/pipe-full-cross-1d
* @prop pipes/pipe-full-elbow-1d
* @prop pipes/pipe-full-fork-1d
* @prop pipes/pipe-full-straight-1d-1l
* @prop pipes/pipe-full-straight-1d-2l
* @prop pipes/pipe-full-straight-1d-4l
* @prop pipes/pipe-full-tee-1d
* @prop pipes/pipe-half-cap-1d
* @prop pipes/pipe-half-cross-1d
* @prop pipes/pipe-half-elbow-1d
* @prop pipes/pipe-half-fork-1d
* @prop pipes/pipe-half-straight-1d-1l
* @prop pipes/pipe-half-straight-1d-2l
* @prop pipes/pipe-half-straight-1d-4l
* @prop pipes/pipe-half-tee-1d
*/

/**
Expand All @@ -920,15 +926,15 @@
* @enum sounds-ui
* @memberof resources
*
* @prop select
* @prop toggle
* @prop notify
* @prop error
* @prop complete
* @prop succeed
* @prop over
* @prop join
* @prop click
* @prop ui/select
* @prop ui/toggle
* @prop ui/notify
* @prop ui/error
* @prop ui/complete
* @prop ui/succeed
* @prop ui/over
* @prop ui/join
* @prop ui/click
*/

/**
Expand All @@ -937,12 +943,12 @@
* @enum sounds-foley
* @memberof resources
*
* @prop metal-scrape
* @prop metal-clack
* @prop metal-rattle
* @prop coin-jingle
* @prop paper-shuffle
* @prop explode
* @prop foley/metal-scrape
* @prop foley/metal-clack
* @prop foley/metal-rattle
* @prop foley/coin-jingle
* @prop foley/paper-shuffle
* @prop foley/explode
*/

/**
Expand All @@ -951,12 +957,12 @@
* @enum sounds-effects
* @memberof resources
*
* @prop fanfare-succeed - The "success!" sound from Holograms Against Humanity.
* @prop fanfare-start - The "Game has started!" sound from HaH.
* @prop fanfare-fail
* @prop timer-10s - a 10 second timer that triggers a bell at exactly 10 seconds.
* @prop effects/fanfare-succeed - The "success!" sound from Holograms Against Humanity.
* @prop effects/fanfare-start - The "Game has started!" sound from HaH.
* @prop effects/fanfare-fail
* @prop effects/timer-10s - a 10 second timer that triggers a bell at exactly 10 seconds.
* The bell lasts for 2 seconds. This allows for timer length changes.
* @prop gain-coin
* @prop effects/gain-coin
*/


Expand Down
2 changes: 1 addition & 1 deletion dist/aframe-altspace-component.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/altspace.altspace-cursor-collider.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<label for="nav-trigger" class="overlay"></label>

<nav>
<h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="altspace.html">altspace</a></li><li><a href="native.html">native</a></li><li><a href="resources.html">resources</a></li><li><a href="sync.html">sync</a></li></ul><h3>Mixins</h3><ul><li><a href="altspace.altspace.html">altspace</a></li><li><a href="altspace.altspace-cursor-collider.html">altspace-cursor-collider</a></li><li><a href="altspace.altspace-tracked-controls.html">altspace-tracked-controls</a></li><li><a href="native.n-billboard.html">n-billboard</a></li><li><a href="native.n-box-collider.html">n-box-collider</a></li><li><a href="native.n-capsule-collider.html">n-capsule-collider</a></li><li><a href="native.n-collider.html">n-collider</a></li><li><a href="native.n-container.html">n-container</a></li><li><a href="native.n-mesh-collider.html">n-mesh-collider</a></li><li><a href="native.n-object.html">n-object</a></li><li><a href="native.n-sound.html">n-sound</a><ul class='methods'><li data-type='method'><a href="native.n-sound.html#pauseSound">pauseSound</a></li><li data-type='method'><a href="native.n-sound.html#playSound">playSound</a></li><li data-type='method'><a href="native.n-sound.html#seek">seek</a></li></ul></li><li><a href="native.n-spawner.html">n-spawner</a></li><li><a href="native.n-sphere-collider.html">n-sphere-collider</a></li><li><a href="native.n-text.html">n-text</a></li><li><a href="sync.sync.html">sync</a><ul class='methods'><li data-type='method'><a href="sync.sync.html#takeOwnership">takeOwnership</a></li></ul></li><li><a href="sync.sync-color.html">sync-color</a></li><li><a href="sync.sync-n-sound.html">sync-n-sound</a></li><li><a href="sync.sync-system.html">sync-system</a></li><li><a href="sync.sync-transform.html">sync-transform</a></li><li><a href="wire.html">wire</a></li></ul>
<h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="altspace.html">altspace</a></li><li><a href="native.html">native</a></li><li><a href="resources.html">resources</a></li><li><a href="sync.html">sync</a></li></ul><h3>Events</h3><ul><li><a href="native.n-sound.html#event:n-sound-loaded">n-sound-loaded</a></li></ul><h3>Mixins</h3><ul><li><a href="altspace.altspace.html">altspace</a></li><li><a href="altspace.altspace-cursor-collider.html">altspace-cursor-collider</a></li><li><a href="altspace.altspace-tracked-controls.html">altspace-tracked-controls</a></li><li><a href="native.n-billboard.html">n-billboard</a></li><li><a href="native.n-box-collider.html">n-box-collider</a></li><li><a href="native.n-capsule-collider.html">n-capsule-collider</a></li><li><a href="native.n-collider.html">n-collider</a></li><li><a href="native.n-container.html">n-container</a></li><li><a href="native.n-mesh-collider.html">n-mesh-collider</a></li><li><a href="native.n-object.html">n-object</a></li><li><a href="native.n-sound.html">n-sound</a><ul class='methods'><li data-type='method'><a href="native.n-sound.html#pauseSound">pauseSound</a></li><li data-type='method'><a href="native.n-sound.html#playSound">playSound</a></li><li data-type='method'><a href="native.n-sound.html#seek">seek</a></li></ul></li><li><a href="native.n-spawner.html">n-spawner</a></li><li><a href="native.n-sphere-collider.html">n-sphere-collider</a></li><li><a href="native.n-text.html">n-text</a></li><li><a href="sync.sync.html">sync</a><ul class='methods'><li data-type='method'><a href="sync.sync.html#takeOwnership">takeOwnership</a></li></ul></li><li><a href="sync.sync-color.html">sync-color</a></li><li><a href="sync.sync-n-sound.html">sync-n-sound</a></li><li><a href="sync.sync-system.html">sync-system</a></li><li><a href="sync.sync-transform.html">sync-transform</a></li><li><a href="wire.html">wire</a></li></ul>
</nav>

<div id="main">
Expand Down
2 changes: 1 addition & 1 deletion doc/altspace.altspace-tracked-controls.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<label for="nav-trigger" class="overlay"></label>

<nav>
<h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="altspace.html">altspace</a></li><li><a href="native.html">native</a></li><li><a href="resources.html">resources</a></li><li><a href="sync.html">sync</a></li></ul><h3>Mixins</h3><ul><li><a href="altspace.altspace.html">altspace</a></li><li><a href="altspace.altspace-cursor-collider.html">altspace-cursor-collider</a></li><li><a href="altspace.altspace-tracked-controls.html">altspace-tracked-controls</a></li><li><a href="native.n-billboard.html">n-billboard</a></li><li><a href="native.n-box-collider.html">n-box-collider</a></li><li><a href="native.n-capsule-collider.html">n-capsule-collider</a></li><li><a href="native.n-collider.html">n-collider</a></li><li><a href="native.n-container.html">n-container</a></li><li><a href="native.n-mesh-collider.html">n-mesh-collider</a></li><li><a href="native.n-object.html">n-object</a></li><li><a href="native.n-sound.html">n-sound</a><ul class='methods'><li data-type='method'><a href="native.n-sound.html#pauseSound">pauseSound</a></li><li data-type='method'><a href="native.n-sound.html#playSound">playSound</a></li><li data-type='method'><a href="native.n-sound.html#seek">seek</a></li></ul></li><li><a href="native.n-spawner.html">n-spawner</a></li><li><a href="native.n-sphere-collider.html">n-sphere-collider</a></li><li><a href="native.n-text.html">n-text</a></li><li><a href="sync.sync.html">sync</a><ul class='methods'><li data-type='method'><a href="sync.sync.html#takeOwnership">takeOwnership</a></li></ul></li><li><a href="sync.sync-color.html">sync-color</a></li><li><a href="sync.sync-n-sound.html">sync-n-sound</a></li><li><a href="sync.sync-system.html">sync-system</a></li><li><a href="sync.sync-transform.html">sync-transform</a></li><li><a href="wire.html">wire</a></li></ul>
<h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="altspace.html">altspace</a></li><li><a href="native.html">native</a></li><li><a href="resources.html">resources</a></li><li><a href="sync.html">sync</a></li></ul><h3>Events</h3><ul><li><a href="native.n-sound.html#event:n-sound-loaded">n-sound-loaded</a></li></ul><h3>Mixins</h3><ul><li><a href="altspace.altspace.html">altspace</a></li><li><a href="altspace.altspace-cursor-collider.html">altspace-cursor-collider</a></li><li><a href="altspace.altspace-tracked-controls.html">altspace-tracked-controls</a></li><li><a href="native.n-billboard.html">n-billboard</a></li><li><a href="native.n-box-collider.html">n-box-collider</a></li><li><a href="native.n-capsule-collider.html">n-capsule-collider</a></li><li><a href="native.n-collider.html">n-collider</a></li><li><a href="native.n-container.html">n-container</a></li><li><a href="native.n-mesh-collider.html">n-mesh-collider</a></li><li><a href="native.n-object.html">n-object</a></li><li><a href="native.n-sound.html">n-sound</a><ul class='methods'><li data-type='method'><a href="native.n-sound.html#pauseSound">pauseSound</a></li><li data-type='method'><a href="native.n-sound.html#playSound">playSound</a></li><li data-type='method'><a href="native.n-sound.html#seek">seek</a></li></ul></li><li><a href="native.n-spawner.html">n-spawner</a></li><li><a href="native.n-sphere-collider.html">n-sphere-collider</a></li><li><a href="native.n-text.html">n-text</a></li><li><a href="sync.sync.html">sync</a><ul class='methods'><li data-type='method'><a href="sync.sync.html#takeOwnership">takeOwnership</a></li></ul></li><li><a href="sync.sync-color.html">sync-color</a></li><li><a href="sync.sync-n-sound.html">sync-n-sound</a></li><li><a href="sync.sync-system.html">sync-system</a></li><li><a href="sync.sync-transform.html">sync-transform</a></li><li><a href="wire.html">wire</a></li></ul>
</nav>

<div id="main">
Expand Down
Loading

0 comments on commit 8118ca8

Please sign in to comment.