Skip to content

Commit d8c6731

Browse files
Specifix5Specifix5
authored
Merge branch 'main' into patch-1
2 parents 188615c + 419c8ad commit d8c6731

File tree

13 files changed

+1040
-517
lines changed

13 files changed

+1040
-517
lines changed

‎.github/workflows/content-checks.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,22 @@ jobs:
6363
run: npm ci
6464

6565
- name: Print workflow information
66+
env:
67+
EVENT_NAME: ${{ github.event_name }}
68+
PR_NUMBER: ${{ github.event.pull_request.number }}
69+
PR_USER_LOGIN: ${{ github.event.pull_request.user.login }}
70+
BASE_REF: ${{ github.event.pull_request.base.ref }}
71+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
72+
HEAD_REF: ${{ github.event.pull_request.head.ref }}
73+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
6674
run: |
67-
echo "Event name: ${{ github.event_name }}"
68-
echo "Pull request number: ${{ github.event.pull_request.number }}"
69-
echo "Pull request user login: ${{ github.event.pull_request.user.login }}"
70-
echo "Base (target) ref: ${{ github.event.pull_request.base.ref }}"
71-
echo "Base (target) sha: ${{ github.event.pull_request.base.sha }}"
72-
echo "Head (source) ref: ${{ github.event.pull_request.head.ref }}"
73-
echo "Head (source) sha: ${{ github.event.pull_request.head.sha }}"
75+
echo "Event name: $EVENT_NAME"
76+
echo "Pull request number: $PR_NUMBER"
77+
echo "Pull request user login: $PR_USER_LOGIN"
78+
echo "Base (target) ref: $BASE_REF"
79+
echo "Base (target) sha: $BASE_SHA"
80+
echo "Head (source) ref: $HEAD_REF"
81+
echo "Head (source) sha: $HEAD_SHA"
7482
git status
7583
git remote -v
7684
git log --oneline -n 10

‎content/en-us/art/validation-errors.md‎

Lines changed: 288 additions & 348 deletions
Large diffs are not rendered by default.

‎content/en-us/reference/cloud/toolbox-service/v1.json‎

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,36 @@
8888
{
8989
"name": "creator",
9090
"in": "query",
91-
"description": "The creator type and ID. E.g. \"user/123\" or \"group/456\"",
91+
"description": "Deprecated: Please refer to the 'userId' and 'groupId' properties instead. The creator type and ID. E.g. \"user/123\" or \"group/456\"",
9292
"schema": {
9393
"pattern": "^(user|group)/\\d+$",
9494
"type": "string"
9595
}
9696
},
97+
{
98+
"name": "userId",
99+
"in": "query",
100+
"description": "The User ID of the creator. Only one of 'userId' and 'groupId' can be present in a query.",
101+
"schema": {
102+
"maximum": 2147483647,
103+
"minimum": 1,
104+
"type": "integer",
105+
"format": "int64",
106+
"nullable": true
107+
}
108+
},
109+
{
110+
"name": "groupId",
111+
"in": "query",
112+
"description": "The Group ID of the creator. Only one of 'userId' and 'groupId' can be present in a query.",
113+
"schema": {
114+
"maximum": 2147483647,
115+
"minimum": 1,
116+
"type": "integer",
117+
"format": "int64",
118+
"nullable": true
119+
}
120+
},
97121
{
98122
"name": "pageToken",
99123
"in": "query",
@@ -148,21 +172,27 @@
148172
"Trending",
149173
"Top",
150174
"AudioDuration",
151-
"CreateTime"
175+
"CreateTime",
176+
"UpdatedTime",
177+
"Ratings"
152178
],
153179
"x-enum-varnames": [
154180
"Relevance",
155181
"Trending",
156182
"Top",
157183
"AudioDuration",
158-
"CreateTime"
184+
"CreateTime",
185+
"UpdatedTime",
186+
"Ratings"
159187
],
160188
"x-enum-descriptions": [
161189
"Relevance",
162190
"Trending",
163191
"Top",
164192
"AudioDuration",
165-
"CreateTime"
193+
"CreateTime",
194+
"UpdatedTime",
195+
"Ratings"
166196
]
167197
}
168198
},
@@ -331,6 +361,9 @@
331361
}
332362
],
333363
"security": [
364+
{
365+
"roblox-legacy-cookie": []
366+
},
334367
{
335368
"roblox-api-key": []
336369
}
@@ -474,7 +507,20 @@
474507
"properties": {
475508
"creator": {
476509
"type": "string",
477-
"description": "The creator type and ID. E.g. user/123 or group/456.",
510+
"description": "Deprecated: Please refer to the 'userId' and 'groupId' properties instead.\r\nThe creator type and ID. E.g. user/123 or group/456.",
511+
"nullable": true,
512+
"deprecated": true
513+
},
514+
"userId": {
515+
"type": "integer",
516+
"description": "The User ID of the creator. Required if the asset is individual-user-owned.",
517+
"format": "int64",
518+
"nullable": true
519+
},
520+
"groupId": {
521+
"type": "integer",
522+
"description": "The Group ID. Required if the asset is group-owned.",
523+
"format": "int64",
478524
"nullable": true
479525
},
480526
"name": {
@@ -1566,29 +1612,43 @@
15661612
"nullable": true
15671613
},
15681614
"SortCategory": {
1569-
"enum": ["Relevance", "Trending", "Top", "AudioDuration", "CreateTime"],
1615+
"enum": [
1616+
"Relevance",
1617+
"Trending",
1618+
"Top",
1619+
"AudioDuration",
1620+
"CreateTime",
1621+
"UpdatedTime",
1622+
"Ratings"
1623+
],
15701624
"type": "string",
15711625
"description": "The category to sort the search results by.",
15721626
"x-enumNames": [
15731627
"Relevance",
15741628
"Trending",
15751629
"Top",
15761630
"AudioDuration",
1577-
"CreateTime"
1631+
"CreateTime",
1632+
"UpdatedTime",
1633+
"Ratings"
15781634
],
15791635
"x-enum-varnames": [
15801636
"Relevance",
15811637
"Trending",
15821638
"Top",
15831639
"AudioDuration",
1584-
"CreateTime"
1640+
"CreateTime",
1641+
"UpdatedTime",
1642+
"Ratings"
15851643
],
15861644
"x-enum-descriptions": [
15871645
"Relevance",
15881646
"Trending",
15891647
"Top",
15901648
"AudioDuration",
1591-
"CreateTime"
1649+
"CreateTime",
1650+
"UpdatedTime",
1651+
"Ratings"
15921652
]
15931653
},
15941654
"SortDirection": {
@@ -2098,6 +2158,12 @@
20982158
}
20992159
},
21002160
"securitySchemes": {
2161+
"roblox-legacy-cookie": {
2162+
"type": "apiKey",
2163+
"description": "A browser cookie that represents the identity of a Roblox user. DO NOT SHARE THIS. Sharing this will allow someone to log in as you and to steal your Robux and items. When possible, use API keys with the x-api-key header or OAuth 2.0 instead for authentication.",
2164+
"in": "cookie",
2165+
"name": ".ROBLOSECURITY"
2166+
},
21012167
"roblox-api-key": {
21022168
"type": "apiKey",
21032169
"description": "A configurable key that allows granular access to Roblox resources. See https://create.roblox.com/docs/cloud/auth/api-keys for more information.",

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,18 @@ methods:
217217
summary: |
218218
Prepares in-experience avatar for preview.
219219
description: |
220-
Triggers HSR generation and attachment point updating for in-experience avatar previews.
221-
This allows for previewing of avatars created in experience with layered
222-
clothing and accessories in the same way they will appear when published
223-
through `Class.AvatarCreationService:PromptCreateAvatarAsync()|PromptCreateAvatarAsync()`.
220+
Triggers HSR generation and attachment point updating for in-experience
221+
avatar previews. This allows for previewing of avatars created in
222+
experience with layered clothing and accessories in the same way they will
223+
appear when published through
224+
`Class.AvatarCreationService:PromptCreateAvatarAsync()|PromptCreateAvatarAsync()`.
224225
225226
When developers use `Class.EditableMesh` and `Class.WrapDeformer` to
226227
modify avatars before publishing, the original HSR data may not accurately
227228
account for the new deformations. This method generates updated HSR data
228229
and corrects attachment points based on the `Class.WrapDeformer`
229-
modifications, ensuring consistent preview and published avatar appearance.
230+
modifications, ensuring consistent preview and published avatar
231+
appearance.
230232
code_samples: []
231233
parameters:
232234
- name: humanoidModel
@@ -490,11 +492,12 @@ events:
490492
`Class.AvatarCreationService:PromptCreateAvatarAsync()|PromptCreateAvatarAsync()`
491493
has completed the moderation process and is ready for use in-experience.
492494
493-
Note that this event only fires for avatars created within the current experience and
494-
will trigger when the `Enum.ModerationStatus` changes from
495-
`Enum.ModerationStatus.NotReviewed|NotReviewed` to any other status.
496-
The event fires on the client only. `Class.AvatarEditorService:GetOutfitDetails|GetOutfitDetails`
497-
can be used on the server to verify the current moderation status if needed.
495+
Note that this event only fires for avatars created within the current
496+
experience and will trigger when the `Enum.ModerationStatus` changes from
497+
`Enum.ModerationStatus.NotReviewed|NotReviewed` to any other status. The
498+
event fires on the client only.
499+
`Class.AvatarEditorService:GetOutfitDetails|GetOutfitDetails` can be used
500+
on the server to verify the current moderation status if needed.
498501
code_samples: []
499502
parameters:
500503
- name: outfitId

‎content/en-us/reference/engine/classes/CaptureService.yaml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ tags:
1717
deprecation_message: ''
1818
properties: []
1919
methods:
20-
- name: CaptureService:CanCaptureVideo
21-
summary: ''
22-
description: ''
23-
code_samples: []
24-
parameters: []
25-
returns:
26-
- type: boolean
27-
summary: ''
28-
tags: []
29-
deprecation_message: ''
30-
security: RobloxScriptSecurity
31-
thread_safety: Unsafe
32-
capabilities: []
33-
writeCapabilities: []
3420
- name: CaptureService:CaptureScreenshot
3521
summary: |
3622
Takes a screenshot and provides a temporary `contentId` to identify it.

‎content/en-us/reference/engine/classes/Dialog.yaml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -283,25 +283,6 @@ methods:
283283
capabilities:
284284
- UI
285285
writeCapabilities: []
286-
- name: Dialog:SetGuiObject
287-
summary: ''
288-
description: ''
289-
code_samples: []
290-
parameters:
291-
- name: gui
292-
type: BillboardGui
293-
default: ''
294-
summary: ''
295-
returns:
296-
- type: ()
297-
summary: ''
298-
tags: []
299-
deprecation_message: ''
300-
security: RobloxScriptSecurity
301-
thread_safety: Unsafe
302-
capabilities:
303-
- UI
304-
writeCapabilities: []
305286
events:
306287
- name: Dialog.DialogChoiceSelected
307288
summary: |

0 commit comments

Comments
 (0)