Skip to content
Snippets Groups Projects
Commit 1c52a287 authored by Kevin Lee's avatar Kevin Lee
Browse files

Merge branch 'master' into bug/networked-counter

parents a552ea05 1e2c1bf2
No related branches found
No related tags found
No related merge requests found
...@@ -183,15 +183,6 @@ ...@@ -183,15 +183,6 @@
<!-- Interactables --> <!-- Interactables -->
<a-entity id="counter" networked-counter="max: 3; ttl: 120"></a-entity> <a-entity id="counter" networked-counter="max: 3; ttl: 120"></a-entity>
<a-entity
gltf-model-plus="src: #interactable-duck"
scale="2 2 2"
class="interactable"
super-spawner="template: #interactable-template;"
position="2.5 1.2 0"
body="mass: 0; type: static; shape: box;"
></a-entity>
<a-entity <a-entity
id="super-cursor" id="super-cursor"
super-cursor="cursor: #3d-cursor; camera: #player-camera;" super-cursor="cursor: #3d-cursor; camera: #player-camera;"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment