Skip to content

Commit d153144

Browse files
authored
Merge branch 'main' into humanoid-patch1
2 parents ec1b631 + 3f0d1ea commit d153144

21 files changed

+356
-406
lines changed

content/common/navigation/engine/reference.yaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -890,16 +890,6 @@ navigation:
890890
type: engineapi
891891
source: /reference/engine/classes/ExperienceNotificationService.yaml
892892
ignoreTranslation: true
893-
- title: ExplorerFilterAutocompleterInstance
894-
path: /reference/engine/classes/ExplorerFilterAutocompleterInstance
895-
type: engineapi
896-
source: /reference/engine/classes/ExplorerFilterAutocompleterInstance.yaml
897-
ignoreTranslation: true
898-
- title: ExplorerFilterInstance
899-
path: /reference/engine/classes/ExplorerFilterInstance
900-
type: engineapi
901-
source: /reference/engine/classes/ExplorerFilterInstance.yaml
902-
ignoreTranslation: true
903893
- title: Explosion
904894
path: /reference/engine/classes/Explosion
905895
type: engineapi
@@ -1585,6 +1575,11 @@ navigation:
15851575
type: engineapi
15861576
source: /reference/engine/classes/NumberValue.yaml
15871577
ignoreTranslation: true
1578+
- title: Object
1579+
path: /reference/engine/classes/Object
1580+
type: engineapi
1581+
source: /reference/engine/classes/Object.yaml
1582+
ignoreTranslation: true
15881583
- title: ObjectValue
15891584
path: /reference/engine/classes/ObjectValue
15901585
type: engineapi

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,34 @@ tags:
1717
deprecation_message: ''
1818
properties: []
1919
methods:
20+
- name: AssetService:CreateEditableImage
21+
summary: ''
22+
description: ''
23+
code_samples: []
24+
parameters: []
25+
returns:
26+
- type: EditableImage
27+
summary: ''
28+
tags: []
29+
deprecation_message: ''
30+
security: None
31+
thread_safety: Unsafe
32+
capabilities: []
33+
writeCapabilities: []
34+
- name: AssetService:CreateEditableMesh
35+
summary: ''
36+
description: ''
37+
code_samples: []
38+
parameters: []
39+
returns:
40+
- type: EditableMesh
41+
summary: ''
42+
tags: []
43+
deprecation_message: ''
44+
security: None
45+
thread_safety: Unsafe
46+
capabilities: []
47+
writeCapabilities: []
2048
- name: AssetService:CreateEditableImageAsync
2149
summary: |
2250
Creates a new `Class.EditableImage` instance populated with the given

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ methods:
5252
description: ''
5353
code_samples: []
5454
parameters:
55+
- name: tokenId
56+
type: string
57+
default:
58+
summary: ''
5559
- name: player
5660
type: Player
5761
default:

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,24 @@ methods:
258258
thread_safety: Unsafe
259259
capabilities: []
260260
writeCapabilities: []
261+
- name: AvatarEditorService:refreshAvatarThumbnails
262+
summary: ''
263+
description: ''
264+
code_samples: []
265+
parameters:
266+
- name: thumbnailTypes
267+
type: Array
268+
default:
269+
summary: ''
270+
returns:
271+
- type: void
272+
summary: ''
273+
tags: []
274+
deprecation_message: ''
275+
security: RobloxScriptSecurity
276+
thread_safety: Unsafe
277+
capabilities: []
278+
writeCapabilities: []
261279
- name: AvatarEditorService:CheckApplyDefaultClothing
262280
summary: |
263281
Used to apply default clothing to the `Class.HumanoidDescription` if

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ methods:
165165
fires under two conditions:
166166
167167
- The tag is removed from an instance within the `Class.DataModel` (game)
168-
using `Class.CollectionService:RemoveTag()` or `Class.Instance:RemoveTag()`.
168+
using `Class.CollectionService:RemoveTag()` or
169+
`Class.Instance:RemoveTag()`.
169170
- An instance with the given tag is removed as a descendant of the
170171
`Class.DataModel`, e.g. by un-setting `Class.Instance.Parent` or
171172
similar.

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ methods:
5757
thread_safety: Unsafe
5858
capabilities: []
5959
writeCapabilities: []
60+
- name: CommerceService:GetCommerceProductInfoAsync
61+
summary: ''
62+
description: ''
63+
code_samples: []
64+
parameters:
65+
- name: commerceProductId
66+
type: int64
67+
default:
68+
summary: ''
69+
returns:
70+
- type: Dictionary
71+
summary: ''
72+
tags:
73+
- Yields
74+
deprecation_message: ''
75+
security: None
76+
thread_safety: Unsafe
77+
capabilities: []
78+
writeCapabilities: []
6079
- name: CommerceService:UserEligibleForRealWorldCommerceAsync
6180
summary: ''
6281
description: ''

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

Lines changed: 0 additions & 69 deletions
This file was deleted.

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,26 @@ properties:
9494
capabilities:
9595
- UI
9696
writeCapabilities: []
97+
- name: ImageButton.ImageContent
98+
summary: ''
99+
description: ''
100+
code_samples: []
101+
type: Content
102+
tags:
103+
- Hidden
104+
- NotReplicated
105+
deprecation_message: ''
106+
security:
107+
read: None
108+
write: None
109+
thread_safety: ReadSafe
110+
category: Image
111+
serialization:
112+
can_load: false
113+
can_save: false
114+
capabilities:
115+
- UI
116+
writeCapabilities: []
97117
- name: ImageButton.ImageRectOffset
98118
summary: |
99119
The offset in pixels of the sub-area of an image to be displayed.

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,26 @@ properties:
8282
capabilities:
8383
- UI
8484
writeCapabilities: []
85+
- name: ImageLabel.ImageContent
86+
summary: ''
87+
description: ''
88+
code_samples: []
89+
type: Content
90+
tags:
91+
- Hidden
92+
- NotReplicated
93+
deprecation_message: ''
94+
security:
95+
read: None
96+
write: None
97+
thread_safety: ReadSafe
98+
category: Image
99+
serialization:
100+
can_load: false
101+
can_save: false
102+
capabilities:
103+
- UI
104+
writeCapabilities: []
85105
- name: ImageLabel.ImageRectOffset
86106
summary: |
87107
The offset in pixels of the sub-area of an image to be displayed.

0 commit comments

Comments
 (0)