Skip to content

Commit 1cb7e02

Browse files
authored
Merge branch 'main' into patch-1
2 parents c30063a + e6a1e01 commit 1cb7e02

File tree

132 files changed

+2621
-1628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+2621
-1628
lines changed

content/common/navigation/cloud/reference.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ navigation:
1010
path: /cloud/reference/errors
1111
- title: OAuth 2.0
1212
path: /cloud/reference/oauth2
13+
- title: OpenAPI Descriptions
14+
path: /cloud/reference/openapi
1315
- heading: v2 Resources
1416
- title: All Cloud API
1517
path: /cloud/reference

content/common/navigation/engine/guides.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,23 @@ navigation:
439439
path: /chat/in-experience-text-chat
440440
- title: Guidelines
441441
path: /chat/guidelines
442-
- title: Customization
443-
path: /chat/customizing-in-experience-text-chat
442+
- title: Chat Window
443+
path: /chat/chat-window
444444
- title: Bubble Chat
445445
path: /chat/bubble-chat
446+
- title: Examples
447+
path: /chat/examples/simple-custom-frontend-ui
448+
section:
449+
- title: Custom UI
450+
path: /chat/examples/simple-custom-frontend-ui
451+
#- title: Custom System Messages
452+
# path: /chat/examples/custom-system-messages
453+
- title: Chat Tags
454+
path: /chat/examples/group-chat-tags
455+
- title: Proximity Chat
456+
path: /chat/examples/proximity-chat
457+
- title: Custom Chat Commands
458+
path: /chat/examples/custom-text-chat-commands
446459
- title: Legacy Chat System
447460
path: /chat/legacy/legacy-chat-system
448461
- title: Performance Optimization

content/common/navigation/engine/reference.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,6 +3298,11 @@ navigation:
32983298
type: engineapi
32993299
source: /reference/engine/enums/AdEventType.yaml
33003300
ignoreTranslation: true
3301+
- title: AdFormat
3302+
path: /reference/engine/enums/AdFormat
3303+
type: engineapi
3304+
source: /reference/engine/enums/AdFormat.yaml
3305+
ignoreTranslation: true
33013306
- title: AdornCullingMode
33023307
path: /reference/engine/enums/AdornCullingMode
33033308
type: engineapi
@@ -4918,6 +4923,11 @@ navigation:
49184923
type: engineapi
49194924
source: /reference/engine/enums/Severity.yaml
49204925
ignoreTranslation: true
4926+
- title: ShowAdResult
4927+
path: /reference/engine/enums/ShowAdResult
4928+
type: engineapi
4929+
source: /reference/engine/enums/ShowAdResult.yaml
4930+
ignoreTranslation: true
49214931
- title: SignalBehavior
49224932
path: /reference/engine/enums/SignalBehavior
49234933
type: engineapi

content/en-us/animation/editor.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ To create a pose:
224224

225225
<Alert severity="info" variant="standard">
226226
When creating poses, you can toggle between **Move** and **Rotate**
227-
modes by pressing <kbd>Ctrl</kbd><kbd>2</kbd> or <kbd>Ctrl</kbd><kbd>4</kbd>,
228-
respectively (<kbd>⌘</kbd><kbd>2</kbd> or <kbd>⌘</kbd><kbd>4</kbd>
229-
on Mac). These modes work exactly like moving and rotating base objects, including the snap settings and incremental values located in the **Snap to Grid** section of the **Model** tab.
227+
modes by pressing <kbd>R</kbd>. These modes work exactly like moving and rotating base objects, including the snap settings and incremental values located in the **Snap&nbsp;to&nbsp;Grid** section of the **Model** tab.
230228
</Alert>
231229

232230
5. Continue moving or rotating bones or meshes until you get the desired pose.
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)