Skip to content

Commit 54c677a

Browse files
authored
Merge branch 'main' into patch-5
2 parents bea10cd + 3a8cabc commit 54c677a

Some content is hidden

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

54 files changed

+579
-1746
lines changed

content/common/navigation/engine/reference.yaml

Lines changed: 15 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ navigation:
2525
type: engineapi
2626
source: /reference/engine/classes/Accoutrement.yaml
2727
ignoreTranslation: true
28-
- title: ActivityHistoryEventService
29-
path: /reference/engine/classes/ActivityHistoryEventService
30-
type: engineapi
31-
source: /reference/engine/classes/ActivityHistoryEventService.yaml
32-
ignoreTranslation: true
3328
- title: Actor
3429
path: /reference/engine/classes/Actor
3530
type: engineapi
@@ -270,11 +265,6 @@ navigation:
270265
type: engineapi
271266
source: /reference/engine/classes/AvatarEditorService.yaml
272267
ignoreTranslation: true
273-
- title: AvatarPreloader
274-
path: /reference/engine/classes/AvatarPreloader
275-
type: engineapi
276-
source: /reference/engine/classes/AvatarPreloader.yaml
277-
ignoreTranslation: true
278268
- title: Backpack
279269
path: /reference/engine/classes/Backpack
280270
type: engineapi
@@ -905,11 +895,6 @@ navigation:
905895
type: engineapi
906896
source: /reference/engine/classes/ExperienceNotificationService.yaml
907897
ignoreTranslation: true
908-
- title: ExplorerServiceVisibilityService
909-
path: /reference/engine/classes/ExplorerServiceVisibilityService
910-
type: engineapi
911-
source: /reference/engine/classes/ExplorerServiceVisibilityService.yaml
912-
ignoreTranslation: true
913898
- title: Explosion
914899
path: /reference/engine/classes/Explosion
915900
type: engineapi
@@ -930,11 +915,6 @@ navigation:
930915
type: engineapi
931916
source: /reference/engine/classes/Feature.yaml
932917
ignoreTranslation: true
933-
- title: FeatureRestrictionManager
934-
path: /reference/engine/classes/FeatureRestrictionManager
935-
type: engineapi
936-
source: /reference/engine/classes/FeatureRestrictionManager.yaml
937-
ignoreTranslation: true
938918
- title: File
939919
path: /reference/engine/classes/File
940920
type: engineapi
@@ -1375,6 +1355,11 @@ navigation:
13751355
type: engineapi
13761356
source: /reference/engine/classes/LineHandleAdornment.yaml
13771357
ignoreTranslation: true
1358+
- title: LiveSyncService
1359+
path: /reference/engine/classes/LiveSyncService
1360+
type: engineapi
1361+
source: /reference/engine/classes/LiveSyncService.yaml
1362+
ignoreTranslation: true
13781363
- title: LocalizationService
13791364
path: /reference/engine/classes/LocalizationService
13801365
type: engineapi
@@ -1505,11 +1490,6 @@ navigation:
15051490
type: engineapi
15061491
source: /reference/engine/classes/MessagingService.yaml
15071492
ignoreTranslation: true
1508-
- title: MLModelDeliveryService
1509-
path: /reference/engine/classes/MLModelDeliveryService
1510-
type: engineapi
1511-
source: /reference/engine/classes/MLModelDeliveryService.yaml
1512-
ignoreTranslation: true
15131493
- title: Model
15141494
path: /reference/engine/classes/Model
15151495
type: engineapi
@@ -1715,11 +1695,6 @@ navigation:
17151695
type: engineapi
17161696
source: /reference/engine/classes/PathfindingService.yaml
17171697
ignoreTranslation: true
1718-
- title: PerformanceControlService
1719-
path: /reference/engine/classes/PerformanceControlService
1720-
type: engineapi
1721-
source: /reference/engine/classes/PerformanceControlService.yaml
1722-
ignoreTranslation: true
17231698
- title: PermissionsService
17241699
path: /reference/engine/classes/PermissionsService
17251700
type: engineapi
@@ -2000,11 +1975,6 @@ navigation:
20001975
type: engineapi
20011976
source: /reference/engine/classes/ReflectionMetadataYieldFunctions.yaml
20021977
ignoreTranslation: true
2003-
- title: RelativeGui
2004-
path: /reference/engine/classes/RelativeGui
2005-
type: engineapi
2006-
source: /reference/engine/classes/RelativeGui.yaml
2007-
ignoreTranslation: true
20081978
- title: RemoteDebuggerServer
20091979
path: /reference/engine/classes/RemoteDebuggerServer
20101980
type: engineapi
@@ -2050,11 +2020,6 @@ navigation:
20502020
type: engineapi
20512021
source: /reference/engine/classes/RigidConstraint.yaml
20522022
ignoreTranslation: true
2053-
- title: RobloxSerializableInstance
2054-
path: /reference/engine/classes/RobloxSerializableInstance
2055-
type: engineapi
2056-
source: /reference/engine/classes/RobloxSerializableInstance.yaml
2057-
ignoreTranslation: true
20582023
- title: RocketPropulsion
20592024
path: /reference/engine/classes/RocketPropulsion
20602025
type: engineapi
@@ -2065,11 +2030,6 @@ navigation:
20652030
type: engineapi
20662031
source: /reference/engine/classes/RodConstraint.yaml
20672032
ignoreTranslation: true
2068-
- title: RomarkRbxAnalyticsService
2069-
path: /reference/engine/classes/RomarkRbxAnalyticsService
2070-
type: engineapi
2071-
source: /reference/engine/classes/RomarkRbxAnalyticsService.yaml
2072-
ignoreTranslation: true
20732033
- title: RopeConstraint
20742034
path: /reference/engine/classes/RopeConstraint
20752035
type: engineapi
@@ -2540,11 +2500,6 @@ navigation:
25402500
type: engineapi
25412501
source: /reference/engine/classes/Teams.yaml
25422502
ignoreTranslation: true
2543-
- title: TelemetryService
2544-
path: /reference/engine/classes/TelemetryService
2545-
type: engineapi
2546-
source: /reference/engine/classes/TelemetryService.yaml
2547-
ignoreTranslation: true
25482503
- title: TeleportAsyncResult
25492504
path: /reference/engine/classes/TeleportAsyncResult
25502505
type: engineapi
@@ -2975,11 +2930,6 @@ navigation:
29752930
type: engineapi
29762931
source: /reference/engine/classes/VRStatusService.yaml
29772932
ignoreTranslation: true
2978-
- title: WebViewService
2979-
path: /reference/engine/classes/WebViewService
2980-
type: engineapi
2981-
source: /reference/engine/classes/WebViewService.yaml
2982-
ignoreTranslation: true
29832933
- title: WedgePart
29842934
path: /reference/engine/classes/WedgePart
29852935
type: engineapi
@@ -3293,6 +3243,11 @@ navigation:
32933243
type: engineapi
32943244
source: /reference/engine/enums/ActuatorType.yaml
32953245
ignoreTranslation: true
3246+
- title: AdAvailabilityResult
3247+
path: /reference/engine/enums/AdAvailabilityResult
3248+
type: engineapi
3249+
source: /reference/engine/enums/AdAvailabilityResult.yaml
3250+
ignoreTranslation: true
32963251
- title: AdEventType
32973252
path: /reference/engine/enums/AdEventType
32983253
type: engineapi
@@ -3533,6 +3488,11 @@ navigation:
35333488
type: engineapi
35343489
source: /reference/engine/enums/Axis.yaml
35353490
ignoreTranslation: true
3491+
- title: BenefitType
3492+
path: /reference/engine/enums/BenefitType
3493+
type: engineapi
3494+
source: /reference/engine/enums/BenefitType.yaml
3495+
ignoreTranslation: true
35363496
- title: BinType
35373497
path: /reference/engine/enums/BinType
35383498
type: engineapi
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:8816ce0010653c41528fb27e7d890364752a025e9d964a3dd98a93ff900581d3
3-
size 6963563
2+
oid sha256:7111a92077d2793adb3870f700146327f6b78639ebc9e31f563033e84a8c9da5
3+
size 6941611

content/en-us/marketplace/marketplace-fees-and-commissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ comments: Updates to this page require careful internal review. We generally don
66

77
You can create and sell bodies, heads, accessories, and clothes on the [Marketplace](https://www.roblox.com/catalog). After you pay any applicable upload fees, you can upload your new asset for marketplace approval. Once the moderation team reviews and approves your asset, you can set your item for sell on the Marketplace.
88

9-
You receive a commission every time users purchase your item. If users purchase your item within an experience using the [Avatar Inspect Menu](../players/avatar-inspect-menu.md) or the [Avatar Editor Service](../players/avatar-editor.md), the experience owner also receives a commission. For information on viewing your sales data, see [Sales Data analytics](../production/analytics/analytics-dashboard.md#sales-data).
9+
You receive a commission every time users purchase your item. If users purchase your item within an experience using the [Avatar Inspect Menu](../players/avatar-inspect-menu.md), [Avatar Editor Service](../players/avatar-editor.md), or `Class.MarketplaceService`, the experience owner also receives a commission. For information on viewing your sales data, see [Sales Data analytics](../production/analytics/analytics-dashboard.md#sales-data).
1010

1111
## Upload fees
1212

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

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

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

Lines changed: 73 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,55 @@ methods:
3737
thread_safety: Unsafe
3838
capabilities: []
3939
writeCapabilities: []
40-
- name: AdService:GetAdAvailability
40+
- name: AdService:HandleWhyThisAdClicked
4141
summary: ''
4242
description: ''
4343
code_samples: []
4444
parameters:
45-
- name: adFormat
46-
type: AdFormat
45+
- name: advertiserName
46+
type: string
47+
default:
48+
summary: ''
49+
- name: payerName
50+
type: string
4751
default:
4852
summary: ''
4953
returns:
50-
- type: Variant
54+
- type: void
5155
summary: ''
5256
tags: []
5357
deprecation_message: ''
54-
security: None
58+
security: RobloxScriptSecurity
59+
thread_safety: Unsafe
60+
capabilities: []
61+
writeCapabilities: []
62+
- name: AdService:OnDemandVideoCompleteFromUI
63+
summary: ''
64+
description: ''
65+
code_samples: []
66+
parameters:
67+
- name: result
68+
type: ShowAdResult
69+
default:
70+
summary: ''
71+
- name: encryptedAdTrackingData
72+
type: string
73+
default:
74+
summary: ''
75+
- name: encryptionMetadata
76+
type: string
77+
default:
78+
summary: ''
79+
- name: rewardDetails
80+
type: string
81+
default:
82+
summary: ''
83+
returns:
84+
- type: void
85+
summary: ''
86+
tags: []
87+
deprecation_message: ''
88+
security: RobloxScriptSecurity
5589
thread_safety: Unsafe
5690
capabilities: []
5791
writeCapabilities: []
@@ -75,21 +109,17 @@ methods:
75109
thread_safety: Unsafe
76110
capabilities: []
77111
writeCapabilities: []
78-
- name: AdService:ShowRewardedVideoAdAsync
112+
- name: AdService:GetAdAvailabilityNowAsync
79113
summary: ''
80114
description: ''
81115
code_samples: []
82116
parameters:
83-
- name: player
84-
type: Player
85-
default:
86-
summary: ''
87-
- name: reward
88-
type: AdReward
117+
- name: adFormat
118+
type: AdFormat
89119
default:
90120
summary: ''
91121
returns:
92-
- type: ShowAdResult
122+
- type: Variant
93123
summary: ''
94124
tags:
95125
- Yields
@@ -98,41 +128,30 @@ methods:
98128
thread_safety: Unsafe
99129
capabilities: []
100130
writeCapabilities: []
101-
events:
102-
- name: AdService.AdAvailabilityChanged
131+
- name: AdService:ShowRewardedVideoAdAsync
103132
summary: ''
104133
description: ''
105134
code_samples: []
106135
parameters:
107-
- name: adFormat
108-
type: AdFormat
136+
- name: player
137+
type: Player
109138
default:
110139
summary: ''
111-
- name: adAvailabilityResult
112-
type: Variant
140+
- name: reward
141+
type: AdReward
113142
default:
114143
summary: ''
115-
tags: []
116-
deprecation_message: ''
117-
security: None
118-
thread_safety: Unsafe
119-
capabilities: []
120-
writeCapabilities: []
121-
- name: AdService.ShowReportAdPopup
122-
summary: ''
123-
description: ''
124-
code_samples: []
125-
parameters:
126-
- name: adInfo
127-
type: Dictionary
128-
default:
144+
returns:
145+
- type: ShowAdResult
129146
summary: ''
130-
tags: []
147+
tags:
148+
- Yields
131149
deprecation_message: ''
132-
security: RobloxScriptSecurity
150+
security: None
133151
thread_safety: Unsafe
134152
capabilities: []
135153
writeCapabilities: []
154+
events:
136155
- name: AdService.VideoAdClosed
137156
summary: |
138157
Fires when an `Class.AdService` video closes.
@@ -154,4 +173,22 @@ events:
154173
thread_safety: Unsafe
155174
capabilities: []
156175
writeCapabilities: []
157-
callbacks: []
176+
callbacks:
177+
- name: AdService.onDemandVideoPlayInUI
178+
summary: ''
179+
description: ''
180+
code_samples: []
181+
parameters:
182+
- name: data
183+
type: Dictionary
184+
default:
185+
summary: ''
186+
returns:
187+
- type: VideoFrame
188+
summary: ''
189+
tags: []
190+
deprecation_message: ''
191+
security: RobloxScriptSecurity
192+
thread_safety: Unsafe
193+
capabilities: []
194+
writeCapabilities: []

0 commit comments

Comments
 (0)