Skip to content

Commit 1a845a2

Browse files
Merge pull request #64 from diarmidmackenzie/move-to-1.7.0
Solve issues with stats-collector for 1.7.0 compatibility
2 parents 1678390 + fe52080 commit 1a845a2

File tree

14 files changed

+3633
-3609
lines changed

14 files changed

+3633
-3609
lines changed

‎dist/aframe-physics-system.js‎

Lines changed: 3604 additions & 3581 deletions
Large diffs are not rendered by default.

‎dist/aframe-physics-system.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ammo/perf.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Physics Benchmark Test - Ammo</title>
66
<meta name="description" content="Physics Benchamrk Test - Ammo">
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
99
<script src="../../dist/aframe-physics-system.js"></script>
1010
<script src="../components/pinboard.js"></script>

‎examples/ammo/stress.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Stress Test AMMO</title>
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/aframe-environment-component@1.5.0/dist/aframe-environment-component.min.js"></script>
99
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>

‎examples/ammo/sweeper.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Sweeper AMMO</title>
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/aframe-environment-component@1.5.0/dist/aframe-environment-component.min.js"></script>
99
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>

‎examples/cannon-worker/perf.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Physics Benchmark Test - Cannon</title>
66
<meta name="description" content="Physics Benchamrk Test - Cannon Worker">
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="../../dist/aframe-physics-system.js"></script>
99
<script src="../components/pinboard.js"></script>
1010
<link rel="stylesheet" href="../styles.css">

‎examples/cannon-worker/stress.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Stress Test CANNON Worker</title>
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/aframe-environment-component@1.5.0/dist/aframe-environment-component.min.js"></script>
99
<script src="../../dist/aframe-physics-system.js"></script>
1010
<script src="../components/force-pushable.js"></script>

‎examples/cannon-worker/sweeper.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Sweeper CANNON Worker</title>
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/aframe-environment-component@1.5.0/dist/aframe-environment-component.min.js"></script>
99
<script src="../../dist/aframe-physics-system.js"></script>
1010
<script src="../components/grab.js"></script>

‎examples/cannon/perf.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Physics Benchmark Test - Cannon</title>
66
<meta name="description" content="Physics Benchamrk Test - Cannon">
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="../../dist/aframe-physics-system.js"></script>
99
<script src="../components/pinboard.js"></script>
1010
<link rel="stylesheet" href="../styles.css">

‎examples/cannon/stress.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Stress Test CANNON</title>
7-
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.7.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/aframe-environment-component@1.5.0/dist/aframe-environment-component.min.js"></script>
99
<script src="../../dist/aframe-physics-system.js"></script>
1010
<script src="../components/force-pushable.js"></script>

0 commit comments

Comments
 (0)