Skip to content

Commit 53a70d5

Browse files
CadeusTheGreatCadeusTheGreat
authored
Merge branch 'main' into Migrate-Vector3-to-vector
2 parents 6fd7e0b + f3a6b7d commit 53a70d5

File tree

17 files changed

+55
-55
lines changed

17 files changed

+55
-55
lines changed

‎content/en-us/cloud/open-cloud/data-store-api-handling.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ DatastoresApi = tutorialFunctions.DataStores()
262262
datastoreName = "PlayerInventory"
263263

264264
# List keys for global scope
265-
specialScopeKeys = DatastoresApi.list_entries(datastoreName, scope = "global", allScopes = False)
265+
specialScopeKeys = DatastoresApi.list_entries(datastoreName, scope = "global", allScopes = False)
266266
print(keys.content)
267267
# List keys for special scope
268268
specialScopeKeys = DatastoresApi.list_entries(datastoreName, scope = "special", allScopes = False)

‎content/en-us/cloud/open-cloud/usage-data-stores.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def get_entry(self, datastore, object_key, scope = None):
117117
if 'Content-MD5' in r.headers:
118118
expected_checksum = r.headers['Content-MD5']
119119
checksum = base64.b64encode(hashlib.md5(r.content).digest())
120-
#print(f'Expected {expected_checksum}, got {checksum}')
120+
#print(f'Expected {expected_checksum}, got {checksum}')
121121

122122
attributes = None
123123
if self.ATTR_HDR in r.headers:

‎content/en-us/education/build-it-play-it-island-of-move/animating-parts.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ For this project, a tween will move an object from a starting position to a goal
4949

5050
-- Tween variables
5151
local buttonTweenInfo = TweenInfo.new(
52-
TWEEN_TIME, -- Time
53-
Enum.EasingStyle.Quad, -- EasingStyle
54-
Enum.EasingDirection.Out -- EasingDirection
52+
TWEEN_TIME, -- Time
53+
Enum.EasingStyle.Quad, -- EasingStyle
54+
Enum.EasingDirection.Out -- EasingDirection
5555
)
5656

5757
local function buttonPress()
@@ -159,10 +159,10 @@ local TWEEN_MOVE_DISTANCE = 3
159159

160160
-- Tween variables
161161
local tweenInfo = TweenInfo.new(
162-
TWEEN_TIME, -- Time
163-
Enum.EasingStyle.Quad, -- EasingStyle
164-
Enum.EasingDirection.Out, -- EasingDirection
165-
1, -- RepeatCount (when less than zero the tween will loop indefinitely)
162+
TWEEN_TIME, -- Time
163+
Enum.EasingStyle.Quad, -- EasingStyle
164+
Enum.EasingDirection.Out, -- EasingDirection
165+
1, -- RepeatCount (when less than zero the tween will loop indefinitely)
166166
true -- Reverses (tween will reverse once reaching its goal)
167167
)
168168

@@ -210,8 +210,8 @@ local TWEEN_SCALE = vector.zero
210210

211211
-- Tween variables
212212
local tweenInfo = TweenInfo.new(
213-
TWEEN_TIME, -- Time
214-
Enum.EasingStyle.Exponential, -- EasingStyle
213+
TWEEN_TIME, -- Time
214+
Enum.EasingStyle.Exponential, -- EasingStyle
215215
Enum.EasingDirection.Out -- EasingDirection
216216
)
217217

@@ -263,10 +263,10 @@ local hitCount = 0
263263

264264
-- Tween variables
265265
local tweenInfo = TweenInfo.new(
266-
TWEEN_TIME, -- Time
267-
Enum.EasingStyle.Exponential, -- EasingStyle
268-
Enum.EasingDirection.InOut, -- EasingDirection
269-
0, -- RepeatCount (when less than zero the tween will loop indefinitely)
266+
TWEEN_TIME, -- Time
267+
Enum.EasingStyle.Exponential, -- EasingStyle
268+
Enum.EasingDirection.InOut, -- EasingDirection
269+
0, -- RepeatCount (when less than zero the tween will loop indefinitely)
270270
true -- Reverses (tween will reverse once reaching its goal)
271271
)
272272

‎content/en-us/physics/constraints/weld.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: WeldConstraint attaches two BaseParts together and ensures they sta
66
A `Class.WeldConstraint` connects two `Class.BasePart|BaseParts` and ensures they stay in the same relative position and orientation to each other. Even if the two parts are not touching, you can weld them together.
77

88
<Alert severity="info">
9-
To attach two `Class.Attachment|Attachments` or `Class.Bone|Bones`, versus two `Class.BasePart|BaseParts`, see [RigidConstraint](../../physics/constraints/rigid.md).
9+
To attach two `Class.Attachment|Attachments` or `Class.Bone|Bones`, versus two `Class.BasePart|BaseParts`, see [RigidConstraint](../../physics/constraints/rigid.md).
1010
</Alert>
1111

1212
The fastest way to create a `Class.WeldConstraint` is by selecting **Weld** through Studio's **Create** menu in the [Model](../../studio/model-tab.md) tab.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ properties:
141141
142142
```lua
143143
local colorSequence = ColorSequence.new({
144-
ColorSequenceKeypoint.new(0, Color3.fromRGB(255, 0, 0)), -- Red
145-
ColorSequenceKeypoint.new(0.5, Color3.fromRGB(0, 188, 203)), -- Cyan
146-
ColorSequenceKeypoint.new(1, Color3.fromRGB(196, 0, 255)), -- Purple
144+
ColorSequenceKeypoint.new(0, Color3.fromRGB(255, 0, 0)), -- Red
145+
ColorSequenceKeypoint.new(0.5, Color3.fromRGB(0, 188, 203)), -- Cyan
146+
ColorSequenceKeypoint.new(1, Color3.fromRGB(196, 0, 255)), -- Purple
147147
}
148148
)
149149
```
@@ -511,9 +511,9 @@ properties:
511511
512512
```lua
513513
local numberSequence = NumberSequence.new({
514-
NumberSequenceKeypoint.new(0, 0), -- Opaque
515-
NumberSequenceKeypoint.new(0.5, 1), -- Transparent
516-
NumberSequenceKeypoint.new(1, 0), -- Opaque
514+
NumberSequenceKeypoint.new(0, 0), -- Opaque
515+
NumberSequenceKeypoint.new(0.5, 1), -- Transparent
516+
NumberSequenceKeypoint.new(1, 0), -- Opaque
517517
}
518518
)
519519
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ properties:
436436
local Players = game:GetService("Players")
437437
local player = Players.LocalPlayer
438438
local mouse = player:GetMouse()
439-
print(mouse.UnitRay.Direction.magnitude) -- Always 1
439+
print(mouse.UnitRay.Direction.Magnitude) -- Always 1
440440
```
441441
code_samples:
442442
type: Ray

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ methods:
11161116
instances or positions, you can use the following:
11171117
11181118
```lua
1119-
local distance = (position1 - position2).magnitude
1119+
local distance = (position1 - position2).Magnitude
11201120
```
11211121
code_samples:
11221122
- Player-DistanceFromCharacter1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ methods:
13431343
local key = Enum.KeyCode.ButtonA
13441344
13451345
local mappings = {
1346-
ButtonA = "rbxasset://BUTTON_A_ASSET", -- Replace with the desired ButtonA asset
1346+
ButtonA = "rbxasset://BUTTON_A_ASSET", -- Replace with the desired ButtonA asset
13471347
ButtonCross = "rbxasset://BUTTON_CROSS_ASSET" -- Replace with the desired ButtonCross asset
13481348
}
13491349

‎content/en-us/resources/modules/friends-locator.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To test the module in Studio, the **FriendsLocator** module must be run in a mul
5252
local FriendsLocator = require(ReplicatedStorage:WaitForChild("FriendsLocator"))
5353

5454
FriendsLocator.configure({
55-
showAllPlayers = RunService:IsStudio(), -- Allows for debugging in Studio
55+
showAllPlayers = RunService:IsStudio(), -- Allows for debugging in Studio
5656
})
5757
```
5858

@@ -86,8 +86,8 @@ The **FriendsLocator** module exposes [events](#events) so that you can introduc
8686
local FriendsLocator = require(ReplicatedStorage:WaitForChild("FriendsLocator"))
8787

8888
FriendsLocator.configure({
89-
showAllPlayers = RunService:IsStudio(), -- Allows for debugging in Studio
90-
teleportToFriend = false, -- Prevent teleport on icon click/tap
89+
showAllPlayers = RunService:IsStudio(), -- Allows for debugging in Studio
90+
teleportToFriend = false, -- Prevent teleport on icon click/tap
9191
})
9292

9393
FriendsLocator.clicked:Connect(function(player, playerCFrame)

‎content/en-us/resources/modules/merch-booth.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ Items such as [clothing and accessories](../../art/accessories/index.md) must be
106106
local MerchBooth = require(ReplicatedStorage:WaitForChild("MerchBooth"))
107107

108108
local items = {
109-
607702162, -- Roblox Baseball Cap
110-
4819740796, -- Robox
111-
1374269, -- Kitty Ears
112-
11884330, -- Nerd Glasses
113-
10476359, -- Paper Hat
109+
607702162, -- Roblox Baseball Cap
110+
4819740796, -- Robox
111+
1374269, -- Kitty Ears
112+
11884330, -- Nerd Glasses
113+
10476359, -- Paper Hat
114114
}
115115

116116
for _, assetId in items do
@@ -169,8 +169,8 @@ Adding [passes](../../production/monetization/game-passes.md) requires pass IDs
169169
local MerchBooth = require(ReplicatedStorage:WaitForChild("MerchBooth"))
170170

171171
local items = {
172-
4343758, -- ColdFyre Armor
173-
28521575, -- Slime Shield
172+
4343758, -- ColdFyre Armor
173+
28521575, -- Slime Shield
174174
}
175175

176176
for _, assetId in items do
@@ -225,8 +225,8 @@ Adding [developer products](../../production/monetization/developer-products.md)
225225
local MerchBooth = require(ReplicatedStorage:WaitForChild("MerchBooth"))
226226

227227
local items = {
228-
1236602053, -- Mana Refill
229-
1257880672, -- Healing Potion
228+
1236602053, -- Mana Refill
229+
1257880672, -- Healing Potion
230230
}
231231

232232
for _, assetId in items do
@@ -723,11 +723,11 @@ local ReplicatedStorage = game:GetService("ReplicatedStorage")
723723
local MerchBooth = require(ReplicatedStorage:WaitForChild("MerchBooth"))
724724

725725
local items = {
726-
607702162, -- Roblox Baseball Cap
727-
4819740796, -- Robox
728-
1374269, -- Kitty Ears
729-
11884330, -- Nerd Glasses
730-
10476359, -- Paper Hat
726+
607702162, -- Roblox Baseball Cap
727+
4819740796, -- Robox
728+
1374269, -- Kitty Ears
729+
11884330, -- Nerd Glasses
730+
10476359, -- Paper Hat
731731
}
732732

733733
for _, assetId in items do
@@ -746,8 +746,8 @@ local ReplicatedStorage = game:GetService("ReplicatedStorage")
746746
local MerchBooth = require(ReplicatedStorage:WaitForChild("MerchBooth"))
747747

748748
local items = {
749-
4343758, -- ColdFyre Armor
750-
28521575, -- Slime Shield
749+
4343758, -- ColdFyre Armor
750+
28521575, -- Slime Shield
751751
}
752752

753753
for _, assetId in items do
@@ -766,8 +766,8 @@ local ReplicatedStorage = game:GetService("ReplicatedStorage")
766766
local MerchBooth = require(ReplicatedStorage:WaitForChild("MerchBooth"))
767767

768768
local items = {
769-
1236602053, -- Mana Refill
770-
1257880672, -- Healing Potion
769+
1236602053, -- Mana Refill
770+
1257880672, -- Healing Potion
771771
}
772772

773773
for _, assetId in items do

0 commit comments

Comments
 (0)