Merge branch 'main' into Party-Time

CansyLand · Sep 25, 2023 · 75d52c8 · 75d52c8
2 parents 15b6721 + 150240c
commit 75d52c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/beer-dispenser/src/modules/beerGlass.ts b/beer-dispenser/src/modules/beerGlass.ts
@@ -71,7 +71,6 @@ export function pickingGlassSystem() {
       })
 
       AvatarAttach.create(parentBeer, {
-        avatarId: currentPlayerId,
         anchorPointId: AvatarAnchorPointType.AAPT_RIGHT_HAND
       })
       Transform.createOrReplace(entity, {

diff --git a/cube-wave-16x16/src/index.ts b/cube-wave-16x16/src/index.ts
@@ -8,7 +8,7 @@ export function main() {
     }
   }
 
-  const sign = engine.addEntity(true)
+  const sign = engine.addEntity()
   Transform.create(sign, {
     position: { x: 8, y: 6, z: 8 },
     scale: { x: 1.2, y: 1.2, z: 1.2 }
@@ -33,7 +33,7 @@ engine.addSystem(CircleHoverSystem)
 // My cube generator
 function createCube(x: number, y: number, z: number) {
   // Dynamic entity because we aren't loading static entities out of this scene code
-  const myEntity = engine.addEntity(true)
+  const myEntity = engine.addEntity()
 
   Transform.create(myEntity, {
     position: { x, y, z }

diff --git a/cube-wave-32x32/src/index.ts b/cube-wave-32x32/src/index.ts
@@ -8,7 +8,7 @@ export function main() {
     }
   }
 
-  const sign = engine.addEntity(true)
+  const sign = engine.addEntity()
   Transform.create(sign, {
     position: { x: 8, y: 6, z: 8 },
     scale: { x: 1.2, y: 1.2, z: 1.2 }
@@ -33,7 +33,7 @@ engine.addSystem(CircleHoverSystem)
 // My cube generator
 function createCube(x: number, y: number, z: number) {
   // Dynamic entity because we aren't loading static entities out of this scene code
-  const myEntity = engine.addEntity(true)
+  const myEntity = engine.addEntity()
 
   Transform.create(myEntity, {
     position: { x, y, z },

diff --git a/scene-bounds-check/src/index.ts b/scene-bounds-check/src/index.ts
@@ -168,7 +168,7 @@ export function main() {
   setAsMovingPlatform(audioSourceEntity, [Vector3.create(24, 1, -31), Vector3.create(24, 1, -33)], 10)
 
   // TEXT SHAPE
-  const textShapeEntity = engine.addEntity(true)
+  const textShapeEntity = engine.addEntity()
   TextShape.create(textShapeEntity, {
     text: 'IA IA CTHULHU FHTAGN!',
     fontSize: 2