Skip to content

Commit 02af040

Browse files
author
ramdoys
authored
Merge branch 'main' into tag-table-patch-1
2 parents ff03bef + 3d8bf93 commit 02af040

Some content is hidden

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

49 files changed

+754
-283
lines changed

content/common/navigation/cloud/reference.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ navigation:
22
- heading: Common Components
33
- title: Overview
44
path: /cloud/reference/
5-
- title: OAuth 2.0
6-
path: /cloud/reference/oauth2
75
- title: Patterns
86
path: /cloud/reference/patterns
97
- title: Types
108
path: /cloud/reference/types
119
- title: Errors
1210
path: /cloud/reference/errors
11+
- title: OAuth 2.0
12+
path: /cloud/reference/oauth2
1313
- heading: v2 Resources
1414
- title: All Cloud API
1515
path: /cloud/reference

content/common/navigation/engine/reference.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3768,11 +3768,6 @@ navigation:
37683768
type: engineapi
37693769
source: /reference/engine/enums/DebuggerStatus.yaml
37703770
ignoreTranslation: true
3771-
- title: DecreaseMinimumPartDensityMode
3772-
path: /reference/engine/enums/DecreaseMinimumPartDensityMode
3773-
type: engineapi
3774-
source: /reference/engine/enums/DecreaseMinimumPartDensityMode.yaml
3775-
ignoreTranslation: true
37763771
- title: DevCameraOcclusionMode
37773772
path: /reference/engine/enums/DevCameraOcclusionMode
37783773
type: engineapi

content/en-us/art/characters/facial-animation/moods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A **mood** is a type of [facial animation](../../../art/characters/facial-animat
2222

2323
## Creating Moods
2424

25-
If you have a character model with an animatable head, you can create any mood animation you can think of using the [Face Animation Editor](../../../art/characters/facial-animation/animating-heads.md#using-the-face-animation-editor). If you don't want to use the [Blocky](../../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip) or [Goblin](../../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip) reference character models, you can create or modify an existing model to support animated heads in a third-party modeling software, such as Blender or Maya. For information on how to create an animatable head, see [Creating Basic Heads](../../../art/characters/facial-animation/creating-basic-heads.md).
25+
If you have a character model with an animatable head, you can create any mood animation you can think of using the [Face Animation Editor](../../../art/characters/facial-animation/animating-heads.md#using-the-face-animation-editor). If you don't want to use the [Blocky](../../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.fbx) or [Goblin](../../../assets/avatar/dynamic-heads/reference-files/GoblinCharacter.zip) reference character models, you can create or modify an existing model to support animated heads in a third-party modeling software, such as Blender or Maya. For information on how to create an animatable head, see [Creating Basic Heads](../../../art/characters/facial-animation/creating-basic-heads.md).
2626

2727
To create a mood:
2828

content/en-us/art/characters/facial-animation/using-heads-in-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If you want to experiment with pre-made heads before [making your own](../../../
3434
<td>A Goblin character model with an animatable head.</td>
3535
</tr>
3636
<tr>
37-
<td>[Blocky Character Model](../../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip)</td>
37+
<td>[Blocky Character Model](../../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.fbx)</td>
3838
<td>A Blocky character model with an animatable head.</td>
3939
</tr>
4040
<tr>

content/en-us/art/characters/project-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following `.fbx`, `.blend`, and `.ma` project files are available to use as
3030
<td>A rigged and skinned humanoid character model with a full body cage, facial animation rig, and associated PBR texture maps.</td>
3131
</tr>
3232
<tr>
33-
<td><a href="../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip" download>BlockyCharacter.zip</a></td>
33+
<td><a href="../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.fbx" download>BlockyCharacter.fbx</a></td>
3434
<td>A Blocky character model with an [animatable head](../../art/characters/facial-animation/index.md) and a full body cage.</td>
3535
</tr>
3636
<tr>

content/en-us/art/modeling/project-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ A Blocky character model with an animatable head and a full body cage.
130130
</CardContent>
131131

132132
<CardActions style={{position: 'absolute', bottom: 0, width: '100%'}}>
133-
<Button href="../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
133+
<Button href="../../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.fbx" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
134134
</CardActions>
135135

136136
</Card>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f2316eaf451990b04ca0daa9478b970f7dcad5fbd216a4d3a2847a493731bbfe
3+
size 1541788
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:0cc1667102a6dee8e90d067ce2ab1075f3cc62f3d866cc5ab7ee775edf3a89ac
3-
size 3300300
2+
oid sha256:82b9ade75d206a6c71483b739fe8a8b365e5a0ef1fd45a5ae9cd944e3155e6a8
3+
size 2992176

content/en-us/avatar/resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ A Blocky character model with an animatable head and a full body cage.
122122
</CardContent>
123123

124124
<CardActions style={{position: 'absolute', bottom: 0, width: '100%'}}>
125-
<Button href="../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.zip" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
125+
<Button href="../assets/avatar/dynamic-heads/reference-files/BlockyCharacter.fbx" fullWidth size='large' color='primary' variant='contained' style={{marginBottom:"4px;"}}>Download</Button>
126126
</CardActions>
127127

128128
</Card>

content/en-us/reference/engine/classes/AssetService.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ methods:
152152
- name: AssetService:CreateEditableMeshFromPartAsync
153153
summary: |
154154
Returns a new `Class.EditableMesh` instance created from an existing
155-
`Class.MeshPart`.
155+
`Class.MeshPart`.
156156
description: |
157157
Returns a new `Class.EditableMesh` instance created from the
158-
`Class.MeshPart.MeshId|MeshId` of an existing `Class.MeshPart`.
158+
`Class.MeshPart.MeshId|MeshId` of an existing `Class.MeshPart`.
159159
code_samples: []
160160
parameters:
161161
- name: meshPart
@@ -171,7 +171,8 @@ methods:
171171
The new `Class.EditableMesh` instance.
172172
tags:
173173
- Yields
174-
deprecation_message: ''
174+
- Deprecated
175+
deprecation_message: 'This function has been deprecated - use `Class.AssetService:CreateEditableMeshAsync()`.'
175176
security: None
176177
thread_safety: Unsafe
177178
capabilities: []
@@ -190,8 +191,8 @@ methods:
190191
`Class.MeshPart`. It throws errors if creation fails.
191192
code_samples: []
192193
parameters:
193-
- name: meshId
194-
type: ContentId
194+
- name: meshContent
195+
type: Content
195196
default:
196197
summary: ''
197198
- name: options
@@ -218,7 +219,7 @@ methods:
218219
tags:
219220
- Yields
220221
deprecation_message: ''
221-
security: PluginSecurity
222+
security: None
222223
thread_safety: Unsafe
223224
capabilities: []
224225
writeCapabilities: []

0 commit comments

Comments
 (0)