Skip to content

Commit

Permalink
Merge branch 'master' into issue_160
Browse files Browse the repository at this point in the history
  • Loading branch information
MignonBelongie authored Oct 14, 2020
2 parents 85aa3c3 + 43bdbba commit 65b2e6e
Show file tree
Hide file tree
Showing 18 changed files with 17,670 additions and 42 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build distribution
on:
push:
branches:
- master
paths:
- 'src/**'
- 'package.json'
- 'package-lock.json'
- 'lib/**'
jobs:
build:
runs-on: ubuntu-18.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 12
- name: Install dependencies
run: npm ci
- name: Build distributions
run: npm run dist
- name: Update built distributions
run: |
git config user.name aframe-physics-system
git config user.email aframe-physics-system@github.com
git add dist
git update-index --refresh
git diff-index --quiet HEAD dist || git commit -m "Update built distributions"
git push
20 changes: 20 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Browser testing CI
on: [push, pull_request]
jobs:
test:
strategy:
matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019]
browser: [ChromeHeadless, FirefoxHeadless]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 12
- name: Install dependencies
run: npm ci
- name: Run tests
run: npx karma start ./tests/karma.conf.js --browsers ${{ matrix.browser }} --single-run
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Ammo.js driver support has been added. Please see [Ammo Driver](/AmmoDriver.md)
+ [Using the CANNON.js API](#using-the-cannonjs-api)
+ [Events](#events)
+ [System Configuration](#system-configuration)
+ [Examples](#examples)

## Installation

Expand Down Expand Up @@ -181,7 +182,7 @@ Example:

```html
<a-box id="other-box" dynamic-body />
<a-box constraint="target: #other-box;" dynamic-body />
<a-box constraint="target: #other-box;" dynamic-body />
```

| Property | Dependencies | Default | Description |
Expand Down Expand Up @@ -309,3 +310,9 @@ Resources:
* [CANNON.World](http://schteppe.github.io/cannon.js/docs/classes/World.html)
* [CANNON.ContactMaterial](http://schteppe.github.io/cannon.js/docs/classes/ContactMaterial.html)

## Examples

To help demonstrate the features and capabilities of `aframe-physics-system` a
collection of examples have been prepared. Please see
[Examples](examples/README.md) for a summary and link to each of the
prepared examples.
Loading

0 comments on commit 65b2e6e

Please sign in to comment.