Skip to content

Commit 5179ee2

Browse files
authored
Merge branch 'main' into patch-5
2 parents c13dd57 + da2935d commit 5179ee2

Some content is hidden

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

60 files changed

+643
-358
lines changed

content/common/navigation/engine/reference.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,6 +3298,11 @@ navigation:
32983298
type: engineapi
32993299
source: /reference/engine/enums/AdEventType.yaml
33003300
ignoreTranslation: true
3301+
- title: AdFormat
3302+
path: /reference/engine/enums/AdFormat
3303+
type: engineapi
3304+
source: /reference/engine/enums/AdFormat.yaml
3305+
ignoreTranslation: true
33013306
- title: AdornCullingMode
33023307
path: /reference/engine/enums/AdornCullingMode
33033308
type: engineapi
@@ -4918,6 +4923,11 @@ navigation:
49184923
type: engineapi
49194924
source: /reference/engine/enums/Severity.yaml
49204925
ignoreTranslation: true
4926+
- title: ShowAdResult
4927+
path: /reference/engine/enums/ShowAdResult
4928+
type: engineapi
4929+
source: /reference/engine/enums/ShowAdResult.yaml
4930+
ignoreTranslation: true
49214931
- title: SignalBehavior
49224932
path: /reference/engine/enums/SignalBehavior
49234933
type: engineapi

content/en-us/animation/editor.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ To create a pose:
224224

225225
<Alert severity="info" variant="standard">
226226
When creating poses, you can toggle between **Move** and **Rotate**
227-
modes by pressing <kbd>Ctrl</kbd><kbd>2</kbd> or <kbd>Ctrl</kbd><kbd>4</kbd>,
228-
respectively (<kbd>⌘</kbd><kbd>2</kbd> or <kbd>⌘</kbd><kbd>4</kbd>
229-
on Mac). These modes work exactly like moving and rotating base objects, including the snap settings and incremental values located in the **Snap to Grid** section of the **Model** tab.
227+
modes by pressing <kbd>R</kbd>. These modes work exactly like moving and rotating base objects, including the snap settings and incremental values located in the **Snap&nbsp;to&nbsp;Grid** section of the **Model** tab.
230228
</Alert>
231229

232230
5. Continue moving or rotating bones or meshes until you get the desired pose.

content/en-us/assets/scripting/input/Cross-Platform-Input-Detection-Mobile.png

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

content/en-us/assets/scripting/input/Cross-Platform-Input-Detection-PC.png

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

content/en-us/chat/bubble-chat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ if not bubbleImageLabel then
166166
bubbleImageLabel = Instance.new("ImageLabel")
167167
bubbleImageLabel.Parent = bubbleChatConfiguration
168168
end
169-
bubbleImageLabel.Image = "rbxassetid://6733332557"
169+
bubbleImageLabel.Image = "rbxassetid://109157529833093"
170170
bubbleImageLabel.ScaleType = Enum.ScaleType.Slice
171171
bubbleImageLabel.SliceCenter = Rect.new(40, 40, 320, 120)
172172
bubbleImageLabel.SliceScale = 0.5

content/en-us/cloud-services/memory-stores/hash-map.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ After you get a hash map, call any of the following functions to read or write d
5454
</tbody>
5555
</table>
5656

57+
For in-depth documentation about each function, see `Class.MemoryStoreHashMap`.
58+
5759
<Alert severity="warning">
5860
All functions accessing data structures in memory stores are asynchronous network calls that might occasionally fail. You should wrap these calls in `Global.LuaGlobals.pcall()` to catch and handle errors, as shown in the code samples.
5961
</Alert>

content/en-us/cloud/open-cloud/oauth2-registration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ redirect URLs meet the following requirements:
8686
## Submitting for Review
8787

8888
To minimize the chances of malicious apps harming the community, registering an
89-
app doesn't make it publicly accessible. Instead, it remains in **private mode**
90-
with a limit of 100 authorized users. This mode is helpful for testing and
89+
app doesn't make it broadly accessible. Instead, it remains in **private mode**
90+
with a limit of 10 unique users. This mode is helpful for testing and
9191
debugging within your team.
9292

9393
If you want to extend the user base for your app, you need to publish it in
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: Roblox Developers Conference
3-
description: RDC is an invite-only, hybrid (in-person and online) event that brings together Roblox developers, brands, and creators from around the world.
3+
description: RDC is an invite-only, hybrid (in-person and online) event that brings together Roblox developers, brands, and creators worldwide.
44
---
55

6-
RDC is an invite-only, hybrid (in-person and online) event that brings together Roblox developers, brands, and creators from around the world. There will be networking opportunities, in-depth breakout sessions, product demonstrations, and office hours—all designed to empower your success and showcase the future of Roblox.
6+
RDC is an invite-only, hybrid (in-person and online) event that brings together Roblox developers, brands, and creators worldwide. There will be networking opportunities, in-depth breakout sessions, product demonstrations, and office hours—all designed to empower your success and showcase the future of Roblox.
77

88
<figure>
99
<Chip
@@ -13,6 +13,6 @@ RDC is an invite-only, hybrid (in-person and online) event that brings together
1313
variant="filled"/>
1414
</figure><br />
1515

16-
Creators will receive invites to the annual Roblox Developer Conference. These invites can be to come in person or to watch virtually. Keep an eye on the DevForum for updates regarding the conference each year. We announce "Save the Date" and when registration opens.
16+
Creators will receive invites to the annual Roblox Developer Conference. These invites can be for in-person attendance or for virtual viewing. Keep an eye on the DevForum for updates regarding the conference each year. We announce "Save the Date" and when registration opens.
1717

18-
For some examples of Roblox Developer Conference keynotes, talks, and Q&A sessions, see the [RDC 2023 YouTube playlist](https://www.youtube.com/playlist?list=PLuEQ5BB-Z1PK3EcpypEHHMlc2lknQCJyP).
18+
For some examples of Roblox Developer Conference keynotes, talks, and Q&A sessions, see the [RDC 2024 YouTube playlist](https://www.youtube.com/playlist?list=PLuEQ5BB-Z1PJi8RJ7Kuc0JhcT0ubgaL43).

content/en-us/education/battle-royale-series/cleanup-and-reset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ local function startTimer()
483483

484484
while myTimer:isRunning() do
485485
-- Adding +1 makes sure the timer display ends at 1 instead of 0.
486-
timeLeft.Value = (math.floor(myTimer:getTimeLeft() + 1))
486+
timeLeft.Value = (myTimer:getTimeLeft() + 1) // 1
487487
-- By not setting the time for wait, it offers more accurate looping
488488
task.wait()
489489
end

content/en-us/education/battle-royale-series/creating-a-gui.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ Remember that module scripts are used to centralize similar code. Since the time
362362
```lua
363363
while myTimer:isRunning() do
364364
-- Adding +1 makes sure the timer display ends at 1 instead of 0.
365-
timeLeft.Value = (math.floor(myTimer:getTimeLeft() + 1))
365+
timeLeft.Value = (myTimer:getTimeLeft() + 1) // 1
366366
-- By not setting the time for wait, it offers more accurate looping
367367
task.wait()
368368
end
@@ -378,7 +378,7 @@ Remember that module scripts are used to centralize similar code. Since the time
378378

379379
while myTimer:isRunning() do
380380
-- Adding +1 makes sure the timer display ends at 1 instead of 0.
381-
timeLeft.Value = (math.floor(myTimer:getTimeLeft() + 1))
381+
timeLeft.Value = (myTimer:getTimeLeft() + 1) // 1
382382
-- By not setting the time for wait, it offers more accurate looping
383383
task.wait()
384384
end
@@ -492,7 +492,7 @@ local function startTimer()
492492

493493
while myTimer:isRunning() do
494494
-- Adding +1 makes sure the timer display ends at 1 instead of 0.
495-
timeLeft.Value = (math.floor(myTimer:getTimeLeft() + 1))
495+
timeLeft.Value = (myTimer:getTimeLeft() + 1) // 1
496496
-- By not setting the time for wait, it offers more accurate looping
497497
task.wait()
498498
end

0 commit comments

Comments
 (0)