Merge branch 'dev' into vrm-mediapipe-update

package.json

@@ -68,6 +68,7 @@
     "make-user-admin": "cross-env ts-node --swc scripts/make-user-admin.ts",
     "migrate": "cd packages/server-core && npm run migrate",
     "migrate:rollback": "cd packages/server-core && npm run migrate:rollback",
+    "migrate:unlock": "cd packages/server-core && npm run migrate:unlock",
     "postinstall": "patch-package --exclude ./node_modules/@mui/",
     "precommit": "no-master-commits -b master",
     "prepare-database": "cross-env APP_ENV=production PREPARE_DATABASE=true EXIT_ON_DB_INIT=true ts-node --swc packages/server/src/index.ts",

packages/client-core/i18n/en/admin.json

@@ -355,6 +355,7 @@
       "homepageLinkButtonEnabled": "Show link button on homepage",
       "homepageLinkButtonRedirect": "URL of homepage link button",
       "homepageLinkButtonText": "Text of homepage link button",
+      "privacyPolicy": "Privacy Policy",
       "taskServer": {
         "taskServer": "Task Server",
         "port": "Port",

packages/client-core/i18n/en/editor.json

@@ -99,6 +99,36 @@
   "toolbar": {
     "lbl-publish": "Publish",
     "lbl-published": "Published",
+    "gizmo": {
+      "description": "Transform Gizmo",
+      "translate": "[T] Translate",
+      "rotate": "[R] Rotate",
+      "scale": "[S] Scale"
+    },
+    "transformSpace": {
+      "description": "Sets your transform control to be oriented to the object(selection) or world",
+      "lbl-world": "World",
+      "info-world": "World space relates to the entire scene’s orientation",
+      "lbl-selection": "Object",
+      "info-selection": "Object Space (your selection) relates to transforms made to a specific object in relationship to the world space",
+      "lbl-toggleTransformSpace": "[Z] Toggle Transform Space"
+    },
+    "transformPivot": {
+      "toggleTransformPivot" : "[X] Toggle Transform Pivot",
+      "lbl-selection": "Selection",
+      "info-selection": "The center pivot of the final asset you selected in the sequence.",
+      "lbl-center": "Center",
+      "info-center": "A pivot that sits at an equal distance between all selections.",
+      "lbl-bottom": "Bottom",
+      "info-bottom": "A pivot that sits equally between all selections and at the bottom of your final selection in the sequence.",
+      "lbl-origin": "Origin",
+      "info-origin": "Sets pivot mode to the world origin (0,0,0)"
+    },
+    "transformSnapTool": {
+      "toggleSnapMode": "[C] Toggle Snap Mode",
+      "info-translate": "Translate objects by a unit of measurement.",
+      "info-rotate": "Rotate objects by a specific degrees."
+    },
     "command": {
       "translate": "Translate",
       "rotate": "Rotate",
@@ -109,15 +139,19 @@
       "toggleGrid": "Toggle Grid Visibility",
       "increaseGridSize": "Increase Grid Size",
       "descreaseGridSize": "Decrease Grid Size",
-      "stopPreview": "Stop Previewing Scene",
-      "playPreview": "Preview Scene"
+      "lbl-stopPreview": "Stop Previewing Scene",
+      "info-stopPreview": "Remove your avatar from scene",
+      "lbl-playPreview": "Preview Scene",
+      "info-playPreview": "Spawns you into the scene"
     },
     "instance": {
       "none": "None",
       "users": "Users",
       "user": "User"
     },
     "render-settings":{
+      "lbl": "Render Settings",
+      "info": "How you view materials in the Engine",
       "lbl-usePostProcessing":"Use Post Processing",
       "info-usePostProcessing":"Enables post processing",
       "lbl-shadowMapResolution":"Shadow Map Resolution",
@@ -126,12 +160,29 @@
       "info-renderMode":"Choose render mode"
     },
     "grid": {
+      "info-toggleGridVisibility": "Toggle Grid Visibility",
+      "info-gridSpacing": "Set grid spacing meters",
       "info-incrementHeight": "Increment Grid Height",
       "info-decrementHeight": "Decrement Grid Height"
+    },
+    "stats": {
+      "lbl": "Toggle Stats",
+      "info": "Show stats about the scene and gives you a clue as to how optimized your scene is."
+    },
+    "helpersToggle": {
+      "lbl-helpers": "Toggle Helpers",
+      "info-helpers": "View hidden information about your scene, ie: colliders",
+      "lbl-nodeHelpers": "Toggle Node Helpers",
+      "info-nodeHelpers": "Helper geometry that helps components have visibility in the scene when inactive."
+    },
+    "sceneScreenshot": {
+      "lbl": "Screenshot",
+      "info": "Takes a screenshot of your scene at the current view."
     }
   },
   "properties": {
     "title": "Properties",
+    "info": "Propeties let you access and edit detailed information about objects in your scene.",
     "lbl-visible": "Visible",
     "lbl-preventBake": "Prevent Bake",
     "lbl-dynamicLoad": "Load Children Dynamically",
@@ -746,7 +797,33 @@
       "placeObjectAtOrigin": "Place Object at Origin",
       "copyURL": "Copy URL",
       "openInNewTab": "Open URL in New Tab",
-      "deleteAsset": "Delete Asset"
+      "deleteAsset": "Delete Asset",
+      "tooltip": {
+        "EE_model": "Creates objects in the hierarchy. Drag a model from the assets folder into the URL box or drag assets directly from project files into the hierarchy.",
+        "EE_volumetric": "Import volumetric files. Accepts DRCS, UVOL, or Manifest Files. Links to cloud hosting.",
+        "EE_video": "Imports a 2D plane that accepts .mp4, .mkv, .avi",
+        "EE_positionalAudio": "Import audio clips, .mp3, .flac, .ogg, .wav, .m4a",
+        "EE_image": "Imports an image into the scene",
+        "GroundPlaneComponent": "Create collision ground plane.",
+        "GroupComponent": "Collection of models or assets.",
+        "PrefabComponent": "Create prefabs from groups or objects that are saved to the assets folder. Saving requires specific naming: 'assetName'.xre.gltf",
+        "ColliderComponent": "Creates a collision ball, cuboid, capsule, or cylinder to be manually placement.",
+        "SpawnPointComponent": "A point where people will appear when they enter your scene.",
+        "PortalComponent": "A portal to teleport a player to a port in a different location.",
+        "AmbientLightComponent": "A combination of direct and indirect light, provides general lighting to all assets.",
+        "PointLightComponent": "A light which emits in all directions from a single point.",
+        "SpotLightComponent": "Creates a light that shines in a specific direction.",
+        "DirectionalLightComponent": "Creates a light that emits evenly in a single direction.",
+        "HemisphereLightComponent": "A light which illuminates the scene from directly overhead.",
+        "EE_ParticleSystem": "Creates a particle emitter.",
+        "SystemComponent": "Inserts code into the scene by creating a new Entity Component System based on the provided .ts file",
+        "EE_behaveGraph": "Customizes state and behavior of entities through a node graph connection.",
+        "EnvMapBakeComponent": "Add Env Mapbake to your scene.",
+        "EE_scenePreviewCamera": "A preview camera which generates a scene thumbnail and the starting position.",
+        "SkyboxComponent": "Sets the area outside your map (skybox) with a specific sky type.",
+        "SplineTrackComponent": "Creates a spline track.",
+        "SplineComponent": "Create and customize curves."
+      }
     },
     "filebrowser": {
       "addNewFolder": "Add New Folder",
@@ -770,15 +847,22 @@
     }
   },
   "hierarchy": {
+    "lbl": "Hierarchy",
+    "info": "The scene Hierarchy contains all element currently in your scene (assets, lighting, items from the tool menu, etc).",
     "lbl-rename": "Rename",
     "lbl-duplicate": "Duplicate",
     "lbl-group": "Group",
     "lbl-delete": "Delete",
     "lbl-expandAll": "Expand All",
     "lbl-collapseAll": "Collapse All",
     "lbl-explode": "Explode Objects",
+    "lbl-addEntity": "Add Entity",
     "isseus": "Issues:"
   },
+  "materialLibrary": {
+    "lbl": "Material Library",
+    "info": "Location of an assets materials and where you can select and edit them."
+  },
   "dnd": {
     "nodes": "{{count}} Nodes Selected",
     "models": "{{count}} Models Selected",

packages/client-core/i18n/en/user.json

@@ -257,7 +257,8 @@
       },
       "userIdCopied": "User ID copied",
       "apiKeyCopied": "API Key copied",
-      "refreshApiKey": "Refresh API Key"
+      "refreshApiKey": "Refresh API Key",
+      "privacyPolicy": "Privacy Policy"
     },
     "oauth": {
       "authenticating": "Authenticating...",

packages/client-core/src/admin/common/variables/location.ts

@@ -23,6 +23,8 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
+import { InstanceID } from '@etherealengine/engine/src/schemas/networking/instance.schema'
+
 export interface LocationColumn {
   id: 'sceneId' | 'maxUsersPerInstance' | 'scene' | 'name' | 'locationType' | 'tags' | 'videoEnabled' | 'action'
   label: string
@@ -77,6 +79,6 @@ export interface LocationData {
   status: string
   location: string
   inviteCode: string
-  instanceId: string
+  instanceId: InstanceID
   action: any
 }

packages/client-core/src/admin/components/Bots/CreateBot.tsx

@@ -43,6 +43,7 @@ import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import { useFind, useMutation } from '@etherealengine/engine/src/common/functions/FeathersHooks'
 import { BotData, botPath } from '@etherealengine/engine/src/schemas/bot/bot.schema'
+import { InstanceID } from '@etherealengine/engine/src/schemas/networking/instance.schema'
 import { locationPath } from '@etherealengine/engine/src/schemas/social/location.schema'
 import { NotificationService } from '../../../common/services/NotificationService'
 import { AuthState } from '../../../user/services/AuthService'
@@ -68,7 +69,7 @@ const CreateBot = () => {
   const state = useHookstate({
     name: '',
     description: '',
-    instance: '',
+    instance: '' as InstanceID,
     location: ''
   })
   const user = useHookstate(getMutableState(AuthState).user)
@@ -107,7 +108,7 @@ const CreateBot = () => {
   useEffect(() => {
     const instanceFilter = data.filter((el) => el.locationId === state.location.value)
     if (instanceFilter.length > 0) {
-      state.merge({ instance: '' })
+      state.merge({ instance: '' as InstanceID })
       currentInstance.set(instanceFilter)
     } else {
       currentInstance.set([])
@@ -117,7 +118,7 @@ const CreateBot = () => {
   const handleSubmit = () => {
     const data: BotData = {
       name: state.name.value,
-      instanceId: state.instance.value || '',
+      instanceId: state.instance.value || ('' as InstanceID),
       userId: user.id.value,
       botCommands: commandData.get({ noproxy: true }),
       description: state.description.value,
@@ -132,7 +133,7 @@ const CreateBot = () => {
 
     if (validateForm(state.value, formErrors.value)) {
       createBotData(data)
-      state.set({ name: '', description: '', instance: '', location: '' })
+      state.set({ name: '', description: '', instance: '' as InstanceID, location: '' })
       commandData.set([])
       currentInstance.set([])
     } else {

packages/client-core/src/admin/components/Bots/UpdateBot.tsx

@@ -40,6 +40,7 @@ import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
 
 import { useFind, useMutation } from '@etherealengine/engine/src/common/functions/FeathersHooks'
 import { BotPatch, BotType, botPath } from '@etherealengine/engine/src/schemas/bot/bot.schema'
+import { InstanceID } from '@etherealengine/engine/src/schemas/networking/instance.schema'
 import { locationPath } from '@etherealengine/engine/src/schemas/social/location.schema'
 import { NotificationService } from '../../../common/services/NotificationService'
 import { AuthState } from '../../../user/services/AuthService'
@@ -57,7 +58,7 @@ const UpdateBot = ({ open, bot, onClose }: Props) => {
   const state = useHookstate({
     name: '',
     description: '',
-    instance: '',
+    instance: '' as InstanceID,
     location: ''
   })
   const formErrors = useHookstate({
@@ -81,7 +82,7 @@ const UpdateBot = ({ open, bot, onClose }: Props) => {
       state.set({
         name: bot?.name,
         description: bot?.description,
-        instance: bot?.instance?.id || '',
+        instance: bot?.instance?.id || ('' as InstanceID),
         location: bot?.location?.id || ''
       })
     }
@@ -127,18 +128,18 @@ const UpdateBot = ({ open, bot, onClose }: Props) => {
   useEffect(() => {
     const instanceFilter = data.filter((el) => el.locationId === state.location.value)
     if (instanceFilter.length > 0) {
-      state.merge({ instance: state.instance.value || '' })
+      state.merge({ instance: state.instance.value || ('' as InstanceID) })
       currentInstance.set(instanceFilter)
     } else {
       currentInstance.set([])
-      state.merge({ instance: '' })
+      state.merge({ instance: '' as InstanceID })
     }
   }, [state.location.value, instancesData])
 
   const handleUpdate = () => {
     const data: BotPatch = {
       name: state.name.value,
-      instanceId: state.instance.value || '',
+      instanceId: state.instance.value || ('' as InstanceID),
       userId: user.id.value,
       description: state.description.value,
       locationId: state.location.value
@@ -152,7 +153,7 @@ const UpdateBot = ({ open, bot, onClose }: Props) => {
 
     if (validateForm(state.value, formErrors.value) && bot) {
       updateBot(bot.id, data)
-      state.set({ name: '', description: '', instance: '', location: '' })
+      state.set({ name: '', description: '', instance: '' as InstanceID, location: '' })
       currentInstance.set([])
       onClose()
     } else {
@@ -221,7 +222,7 @@ const UpdateBot = ({ open, bot, onClose }: Props) => {
             disableElevation
             type="submit"
             onClick={() => {
-              state.set({ name: '', description: '', instance: '', location: '' })
+              state.set({ name: '', description: '', instance: '' as InstanceID, location: '' })
               formErrors.set({ name: '', description: '', location: '' })
               onClose()
             }}

packages/client-core/src/admin/components/Instance/InstanceDrawer.tsx

@@ -37,9 +37,10 @@ import Grid from '@etherealengine/ui/src/primitives/mui/Grid'
 
 import { useFind, useMutation } from '@etherealengine/engine/src/common/functions/FeathersHooks'
 import { instanceAttendancePath } from '@etherealengine/engine/src/schemas/networking/instance-attendance.schema'
+import { InstanceID } from '@etherealengine/engine/src/schemas/networking/instance.schema'
 import { userKickPath } from '@etherealengine/engine/src/schemas/user/user-kick.schema'
 import { UserID, userPath } from '@etherealengine/engine/src/schemas/user/user.schema'
-import { toDateTimeSql } from '@etherealengine/server-core/src/util/get-datetime-sql'
+import { toDateTimeSql } from '@etherealengine/server-core/src/util/datetime-sql'
 import ConfirmDialog from '../../../common/components/ConfirmDialog'
 import { NotificationService } from '../../../common/services/NotificationService'
 import DrawerView from '../../common/DrawerView'
@@ -57,7 +58,7 @@ const INFINITY = 'INFINITY'
 
 const INSTANCE_USERS_PAGE_LIMIT = 10
 
-const useUsersInInstance = (instanceId: string) => {
+const useUsersInInstance = (instanceId: InstanceID) => {
   const instanceAttendances = useFind(instanceAttendancePath, {
     query: {
       instanceId
@@ -99,11 +100,11 @@ const InstanceDrawer = ({ open, selectedInstance, onClose }: Props) => {
   const openKickDialog = useHookstate(false)
   const kickData = useHookstate({
     userId: '' as UserID,
-    instanceId: '',
+    instanceId: '' as InstanceID,
     duration: '8'
   })
 
-  const instanceUsersQuery = useUsersInInstance(selectedInstance?.id ?? '')
+  const instanceUsersQuery = useUsersInInstance(selectedInstance?.id ?? ('' as InstanceID))
   const kickUser = useKickUser()
 
   const createData = (id: UserID, name: string) => ({

packages/client-core/src/admin/components/Invite/AdminInvites.tsx

@@ -34,7 +34,7 @@ import { UserID } from '@etherealengine/engine/src/schemas/user/user.schema'
 
 import { useFind, useMutation } from '@etherealengine/engine/src/common/functions/FeathersHooks'
 import { InviteType, invitePath } from '@etherealengine/engine/src/schemas/social/invite.schema'
-import { toDateTimeSql } from '@etherealengine/server-core/src/util/get-datetime-sql'
+import { toDateTimeSql } from '@etherealengine/server-core/src/util/datetime-sql'
 import { INVITE_PAGE_LIMIT } from '../../../social/services/InviteService'
 import TableComponent from '../../common/Table'
 import { InviteColumn, inviteColumns } from '../../common/variables/invite'

packages/client-core/src/admin/components/Invite/CreateInviteModal.tsx

@@ -50,7 +50,7 @@ import { useFind } from '@etherealengine/engine/src/common/functions/FeathersHoo
 import { InviteData } from '@etherealengine/engine/src/schemas/social/invite.schema'
 import { locationPath } from '@etherealengine/engine/src/schemas/social/location.schema'
 import { userPath } from '@etherealengine/engine/src/schemas/user/user.schema'
-import { toDateTimeSql } from '@etherealengine/server-core/src/util/get-datetime-sql'
+import { toDateTimeSql } from '@etherealengine/server-core/src/util/datetime-sql'
 import { NotificationService } from '../../../common/services/NotificationService'
 import { InviteService } from '../../../social/services/InviteService'
 import DrawerView from '../../common/DrawerView'

packages/client-core/src/admin/components/Invite/UpdateInviteModal.tsx

@@ -51,7 +51,7 @@ import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
 import { InvitePatch, InviteType, invitePath } from '@etherealengine/engine/src/schemas/social/invite.schema'
 import { locationPath } from '@etherealengine/engine/src/schemas/social/location.schema'
 import { userPath } from '@etherealengine/engine/src/schemas/user/user.schema'
-import { toDateTimeSql } from '@etherealengine/server-core/src/util/get-datetime-sql'
+import { toDateTimeSql } from '@etherealengine/server-core/src/util/datetime-sql'
 import { Id } from '@feathersjs/feathers'
 import { NotificationService } from '../../../common/services/NotificationService'
 import DrawerView from '../../common/DrawerView'

packages/client-core/src/admin/components/Invite/index.tsx

@@ -82,8 +82,7 @@ const InvitesConsole = () => {
               >
                 {t('admin:components.invite.create')}
               </Button>
-
-              {selectedInviteIds.value.size && (
+              {selectedInviteIds.size.value > 0 && (
                 <IconButton
                   className={styles.filterButton}
                   sx={{ ml: 1 }}