Skip to content

Commit cbd68e2

Browse files
vincentfretinvincentfretin
authored
Merge pull request #434 from diarmidmackenzie/move-to-1.5.0
Move examples to 1.5.0
2 parents d564aad + 7d1d842 commit cbd68e2

File tree

8 files changed

+11
-20
lines changed

8 files changed

+11
-20
lines changed

‎examples/animation-controls/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Animation Controls</title>
77
<link rel="stylesheet" href="./styles.css">
8-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
8+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
99
<script src="../bundle.js"></script>
1010
<script src="./animation-controls.js"></script>
1111
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>

‎examples/castle/index.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 • Castle</title>
7-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
88
<script src="../bundle.js"></script>
99
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
1010
<script>

‎examples/checkpoints/index.html

Lines changed: 2 additions & 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 • Checkpoints</title>
7-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
88
<script src="../bundle.js"></script>
99
</head>
1010
<body>
@@ -20,6 +20,7 @@
2020
position="0 1.6 0"
2121
look-controls="pointerLockEnabled: true">
2222
<a-entity cursor
23+
raycaster="objects:[checkpoint]"
2324
position="0 0 -1"
2425
geometry="primitive: ring; radiusInner: 0.02; radiusOuter: 0.03;"
2526
material="color: #CCC; shader: flat;"></a-entity>

‎examples/env-map/index.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 • Environment Map</title>
7-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
88
<script src="../bundle.js"></script>
99
</head>
1010
<body>

‎examples/index.html

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,9 @@ <h3>Examples</h3>
8888
<td>❌</td>
8989
</tr>
9090
<tr>
91-
<td><a href="platforms/">Platforms</a></td>
92-
<td>physics, locomotion</td>
93-
<td>❌</td>
94-
</tr>
95-
<tr>
96-
<td><a href="playground/">Playground</a></td>
97-
<td>physics</td>
98-
<td>❌</td>
99-
</tr>
100-
<tr>
101-
<td><a href="walls/">Walls</a></td>
102-
<td>physics, locomotion</td>
103-
<td>❌</td>
91+
<td><a href="tubes/">Tubes</a></td>
92+
<td>a-tube</td>
93+
<td>✅</td>
10494
</tr>
10595
</tbody>
10696
</table>

‎examples/island/index.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 • Island</title>
7-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
88
<script src="../bundle.js"></script>
99
</head>
1010
<body>

‎examples/tubes/index.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 • Tubes</title>
7-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
88
<script src="../bundle.js"></script>
99
</head>
1010
<body>

‎examples/vive/index.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 • Tracked controls</title>
7-
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
88
<script src="../bundle.js"></script>
99
<script src="https://cdn.jsdelivr.net/npm/@c-frame/[email protected]/dist/aframe-physics-system.min.js"></script>
1010
</head>

0 commit comments

Comments
 (0)