Skip to content

Commit a7584b2

Browse files
authored
Merge branch 'main' into patch-5
2 parents e76ddcb + 977557e commit a7584b2

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ description: |
99
`Class.AudioAnalyzer` takes measurements from audio streams that are wired to
1010
it through `Class.Wire`. It provides a single **Input** pin but does not
1111
produce any output streams.
12+
Note that all audio processing is disabled on the server in order to conserve resources;
13+
Properties and methods of `Class.AudioAnalyzer` return empty or zero results when used from server scripts.
1214
code_samples: []
1315
inherits:
1416
- Instance
@@ -20,7 +22,8 @@ properties:
2022
The loudest volume observed during the last audio buffer.
2123
description: |
2224
The loudest volume observed during the last audio buffer. This property
23-
changes often and thus does not fire changed events.
25+
changes more often than the framerate and does not fire changed events.
26+
On the server, this property is always `0`.
2427
code_samples: []
2528
type: float
2629
tags:
@@ -46,6 +49,8 @@ properties:
4649
This property is generally more stable than
4750
`Class.AudioAnalyzer.PeakLevel|PeakLevel` but it may not capture momentary
4851
volume spikes.
52+
This property changes more often than the framerate and does not fire changed events.
53+
On the server, this property is always `0`.
4954
code_samples: []
5055
type: float
5156
tags:
@@ -116,8 +121,9 @@ methods:
116121
description: |
117122
Returns the frequency spectrum of the last audio buffer, as an array of
118123
numbers. The elements of the array are root-mean-square volume levels,
119-
evenly spaced from 0 hertz to 24,000 hertz. If any of the analyzer's
120-
inputs come from an `Class.AudioDeviceInput`, this method returns an empty
124+
evenly spaced from 0 hertz to 24,000 hertz.
125+
If any of the analyzer's
126+
inputs come from an `Class.AudioDeviceInput`, or this method is used from a server script, it returns an empty
121127
array.
122128
code_samples: []
123129
parameters: []

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ properties:
5959
Color of the text in the chat window.
6060
description: |
6161
Determines the color of the text in the chat window. Default value is
62-
`Datatype.Color3.new(255, 255, 255)` (white).
62+
`Datatype.Color3.fromRGB(255, 255, 255)` (white).
6363
code_samples: []
6464
type: Color3
6565
tags: []
@@ -100,7 +100,7 @@ properties:
100100
Stroke color applied to text in the chat window.
101101
description: |
102102
Determines the stroke color applied to text in the chat window. Default
103-
value is `Datatype.Color3.new(0, 0, 0)` (black).
103+
value is `Datatype.Color3.fromRGB(0, 0, 0)` (black).
104104
code_samples: []
105105
type: Color3
106106
tags: []

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ events:
11671167
summary: |
11681168
Fires when a purchase prompt for a developer product is closed. Do not use this event to process purchases.
11691169
description: |
1170-
##### Do not use the `PromptProductPurchaseFinished` event to process purchases; instead, use the `Class.MarketplaceService.ProcessReceipt|ProcessReceipt` callback. The firing of `PromptProductPurchaseFinished` does NOT mean that a user has successfully purchased an item.
1170+
**IMPORTANT:** Do **not** use the `PromptProductPurchaseFinished` event to process purchases; instead, use the `Class.MarketplaceService.ProcessReceipt|ProcessReceipt` callback. The firing of `PromptProductPurchaseFinished` does **not** mean that a user has successfully purchased an item.
11711171
11721172
This event fires when a purchase prompt for a [developer product](../../../production/monetization/developer-products.md) closes. For example, when a user receives the purchase prompt and clicks **Cancel**, or when they receive a success or error message and click **OK**. The firing of this event does **not** mean that a user has successfully purchased an item.
11731173
@@ -1285,8 +1285,8 @@ callbacks:
12851285
summary: |
12861286
A callback to process receipts of developer product purchases.
12871287
description: |
1288-
##### We **highly recommend** that you properly implement the `ProcessReceipt` callback in order to sell your developer products. You should use `ProcessReceipt` to grant users their purchased product over any other granting method. If your `ProcessReceipt` implementation isn't correct, you will NOT be able to grant users the products they have purchased on the Experience Detail page.
1289-
1288+
**IMPORTANT:** We **highly recommend** that you properly implement the `ProcessReceipt` callback in order to sell your developer products. You should use `ProcessReceipt` to grant users their purchased product over any other granting method. If your `ProcessReceipt` implementation isn't correct, you will **not** be able to grant users the products they have purchased on the Experience Detail page.
1289+
12901290
A callback to process receipts from [developer product](../../../production/monetization/developer-products.md) purchases. You can sell developer products inside an experience using `MarketplaceService` functions, or outside an experience on the Experience Detail page.
12911291
12921292
You should only set the `ProcessReceipt` callback one time in a single server-side `Class.Script|Script`. This callback must handle the receipts for all developer products you have for sale.
@@ -1345,12 +1345,6 @@ callbacks:
13451345
transaction.
13461346
- `CurrencyType` — The type of currency spent in the purchase;
13471347
always `Enum.CurrencyType.Robux`.
1348-
- `ProductPurchaseChannel` — An enum that represents how the user acquired the developer product.
1349-
1350-
- `InExperience`: The purchase was made inside of an experience.
1351-
- `ExperienceDetailsPage`: The purchase was made outside of an experience, on the Experience Details page.
1352-
- `AdReward`: The product was rewarded to the user when they watched a video ad to completion.
1353-
- `CommerceProduct`: The user acquired the product as a benefit of purchasing a commerce merchandise from the developer of the experience.
13541348
returns:
13551349
- type: ProductPurchaseDecision
13561350
summary: |

content/en-us/studio/shortcuts.md

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Studio has many default shortcuts and key commands that make development quicker
3131
</tr>
3232
<tr>
3333
<td>**Open from Roblox...**</td>
34-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>O</kbd></td>
35-
<td><kbd>Shift</kbd><kbd></kbd><kbd>O</kbd></td>
34+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>O</kbd></td>
35+
<td><kbd></kbd><kbd>Shift</kbd><kbd>O</kbd></td>
3636
<td>Open a recent experience from Roblox.</td>
3737
</tr>
3838
<tr>
@@ -43,8 +43,8 @@ Studio has many default shortcuts and key commands that make development quicker
4343
</tr>
4444
<tr>
4545
<td>**Save to File As...**</td>
46-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>S</kbd></td>
47-
<td><kbd>Shift</kbd><kbd></kbd><kbd>S</kbd></td>
46+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>S</kbd></td>
47+
<td><kbd></kbd><kbd>Shift</kbd><kbd>S</kbd></td>
4848
<td>Save the active local file with a new name.</td>
4949
</tr>
5050
<tr>
@@ -73,8 +73,8 @@ Studio has many default shortcuts and key commands that make development quicker
7373
</tr>
7474
<tr>
7575
<td>**Open Previous Tab**</td>
76-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>T</kbd></td>
77-
<td><kbd>Shift</kbd><kbd></kbd><kbd>T</kbd></td>
76+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>T</kbd></td>
77+
<td><kbd></kbd><kbd>Shift</kbd><kbd>T</kbd></td>
7878
<td>Open the previous tab.</td>
7979
</tr>
8080
<tr>
@@ -177,8 +177,8 @@ Studio has many default shortcuts and key commands that make development quicker
177177
</tr>
178178
<tr>
179179
<td>**Paste Into**</td>
180-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>V</kbd></td>
181-
<td><kbd>Shift</kbd><kbd></kbd><kbd>V</kbd></td>
180+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>V</kbd></td>
181+
<td><kbd></kbd><kbd>Shift</kbd><kbd>V</kbd></td>
182182
<td>Paste the objects currently on the clipboard as children of the selected object.</td>
183183
</tr>
184184
<tr>
@@ -225,8 +225,8 @@ Studio has many default shortcuts and key commands that make development quicker
225225
</tr>
226226
<tr>
227227
<td>**Redo**</td>
228-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>Z</kbd></td>
229-
<td><kbd>Shift</kbd><kbd></kbd><kbd>Z</kbd></td>
228+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>Z</kbd></td>
229+
<td><kbd></kbd><kbd>Shift</kbd><kbd>Z</kbd></td>
230230
<td>Redo the previously undone action.</td>
231231
</tr>
232232
</tbody>
@@ -323,26 +323,26 @@ Studio has many default shortcuts and key commands that make development quicker
323323
</tr>
324324
<tr>
325325
<td>**Union**</td>
326-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>G</kbd></td>
327-
<td><kbd>Shift</kbd><kbd></kbd><kbd>G</kbd></td>
326+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>G</kbd></td>
327+
<td><kbd></kbd><kbd>Shift</kbd><kbd>G</kbd></td>
328328
<td>Join two or more parts together to form a single solid union; see [Solid Modeling](../parts/solid-modeling.md) for details.</td>
329329
</tr>
330330
<tr>
331331
<td>**Intersect**</td>
332-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>I</kbd></td>
333-
<td><kbd>Shift</kbd><kbd></kbd><kbd>I</kbd></td>
332+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>I</kbd></td>
333+
<td><kbd></kbd><kbd>Shift</kbd><kbd>I</kbd></td>
334334
<td>Intersect overlapping parts into a single solid intersection; see [Solid Modeling](../parts/solid-modeling.md) for details.</td>
335335
</tr>
336336
<tr>
337337
<td>**Negate**</td>
338-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>N</kbd></td>
339-
<td><kbd>Shift</kbd><kbd></kbd><kbd>N</kbd></td>
338+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>N</kbd></td>
339+
<td><kbd></kbd><kbd>Shift</kbd><kbd>N</kbd></td>
340340
<td>Negate parts, useful for making holes and indentations; see [Solid Modeling](../parts/solid-modeling.md) for details.</td>
341341
</tr>
342342
<tr>
343343
<td>**Separate**</td>
344-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>U</kbd></td>
345-
<td><kbd>Shift</kbd><kbd></kbd><kbd>U</kbd></td>
344+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>U</kbd></td>
345+
<td><kbd></kbd><kbd>Shift</kbd><kbd>U</kbd></td>
346346
<td>Separate the union or intersection back into its individual parts; see [Solid Modeling](../parts/solid-modeling.md) for details.</td>
347347
</tr>
348348
</tbody>
@@ -402,14 +402,14 @@ Studio has many default shortcuts and key commands that make development quicker
402402
</tr>
403403
<tr>
404404
<td>**Explorer Filter**</td>
405-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>X</kbd></td>
406-
<td><kbd>Shift</kbd><kbd></kbd><kbd>X</kbd></td>
405+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>X</kbd></td>
406+
<td><kbd></kbd><kbd>Shift</kbd><kbd>X</kbd></td>
407407
<td>Jump to the [Explorer](../studio/explorer.md) window filter input field.</td>
408408
</tr>
409409
<tr>
410410
<td>**Properties Filter**</td>
411-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>P</kbd></td>
412-
<td><kbd>Shift</kbd><kbd></kbd><kbd>P</kbd></td>
411+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>P</kbd></td>
412+
<td><kbd></kbd><kbd>Shift</kbd><kbd>P</kbd></td>
413413
<td>Jump to the [Properties](../studio/properties.md) window filter input field.</td>
414414
</tr>
415415
<tr>
@@ -495,38 +495,38 @@ Studio has many default shortcuts and key commands that make development quicker
495495
</tr>
496496
<tr>
497497
<td>**Save and Reload Plugins in Debugger**</td>
498-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>L</kbd></td>
499-
<td><kbd>Shift</kbd><kbd></kbd><kbd>L</kbd></td>
498+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>L</kbd></td>
499+
<td><kbd></kbd><kbd>Shift</kbd><kbd>L</kbd></td>
500500
<td>Save all plugins in debugger back to disk, stop execution of those plugins, and reload them from disk.</td>
501501
</tr>
502502
<tr>
503503
<td>**Stats**</td>
504-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>F1</kbd></td>
505-
<td><kbd>Shift</kbd><kbd></kbd><kbd>F1</kbd></td>
504+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>F1</kbd></td>
505+
<td><kbd></kbd><kbd>Shift</kbd><kbd>F1</kbd></td>
506506
<td>Show detailed experience stats.</td>
507507
</tr>
508508
<tr>
509509
<td>**Render**</td>
510-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>F2</kbd></td>
511-
<td><kbd>Shift</kbd><kbd></kbd><kbd>F2</kbd></td>
510+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>F2</kbd></td>
511+
<td><kbd></kbd><kbd>Shift</kbd><kbd>F2</kbd></td>
512512
<td>Show detailed graphics and performance data.</td>
513513
</tr>
514514
<tr>
515515
<td>**Network**</td>
516-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>F3</kbd></td>
517-
<td><kbd>Shift</kbd><kbd></kbd><kbd>F3</kbd></td>
516+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>F3</kbd></td>
517+
<td><kbd></kbd><kbd>Shift</kbd><kbd>F3</kbd></td>
518518
<td>Show detailed network stats. Once open, pressing <kbd>Shift</kbd><kbd>1</kbd> cycles through additional panels of data.</td>
519519
</tr>
520520
<tr>
521521
<td>**Physics**</td>
522-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>F4</kbd></td>
523-
<td><kbd>Shift</kbd><kbd></kbd><kbd>F4</kbd></td>
522+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>F4</kbd></td>
523+
<td><kbd></kbd><kbd>Shift</kbd><kbd>F4</kbd></td>
524524
<td>Show detailed physics data.</td>
525525
</tr>
526526
<tr>
527527
<td>**Summary**</td>
528-
<td><kbd>Shift</kbd><kbd>Ctrl</kbd><kbd>F5</kbd></td>
529-
<td><kbd>Shift</kbd><kbd></kbd><kbd>F5</kbd></td>
528+
<td><kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>F5</kbd></td>
529+
<td><kbd></kbd><kbd>Shift</kbd><kbd>F5</kbd></td>
530530
<td>Show a summary of stats data.</td>
531531
</tr>
532532
</tbody>
@@ -616,7 +616,7 @@ Studio has many default shortcuts and key commands that make development quicker
616616
<tr>
617617
<td>**Redo**</td>
618618
<td><kbd>Ctrl</kbd><kbd>Y</kbd></td>
619-
<td><kbd>Shift</kbd><kbd></kbd><kbd>Z</kbd></td>
619+
<td><kbd></kbd><kbd>Shift</kbd><kbd>Z</kbd></td>
620620
</tr>
621621
<tr>
622622
<td>**Select All**</td>

0 commit comments

Comments
 (0)