Skip to content

Commit 244d337

Browse files
authored
Merge branch 'main' into patch-3
2 parents cd3220e + 4254fa6 commit 244d337

File tree

136 files changed

+1684
-1298
lines changed

Some content is hidden

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

136 files changed

+1684
-1298
lines changed

content/common/navigation/engine/reference.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,6 +2010,11 @@ navigation:
20102010
type: engineapi
20112011
source: /reference/engine/classes/RigidConstraint.yaml
20122012
ignoreTranslation: true
2013+
- title: RobloxSerializableInstance
2014+
path: /reference/engine/classes/RobloxSerializableInstance
2015+
type: engineapi
2016+
source: /reference/engine/classes/RobloxSerializableInstance.yaml
2017+
ignoreTranslation: true
20132018
- title: RocketPropulsion
20142019
path: /reference/engine/classes/RocketPropulsion
20152020
type: engineapi
@@ -2020,6 +2025,11 @@ navigation:
20202025
type: engineapi
20212026
source: /reference/engine/classes/RodConstraint.yaml
20222027
ignoreTranslation: true
2028+
- title: RomarkRbxAnalyticsService
2029+
path: /reference/engine/classes/RomarkRbxAnalyticsService
2030+
type: engineapi
2031+
source: /reference/engine/classes/RomarkRbxAnalyticsService.yaml
2032+
ignoreTranslation: true
20232033
- title: RopeConstraint
20242034
path: /reference/engine/classes/RopeConstraint
20252035
type: engineapi
@@ -2915,6 +2925,11 @@ navigation:
29152925
type: engineapi
29162926
source: /reference/engine/classes/VRStatusService.yaml
29172927
ignoreTranslation: true
2928+
- title: WebViewService
2929+
path: /reference/engine/classes/WebViewService
2930+
type: engineapi
2931+
source: /reference/engine/classes/WebViewService.yaml
2932+
ignoreTranslation: true
29182933
- title: WedgePart
29192934
path: /reference/engine/classes/WedgePart
29202935
type: engineapi
@@ -4753,6 +4768,11 @@ navigation:
47534768
type: engineapi
47544769
source: /reference/engine/enums/SalesTypeFilter.yaml
47554770
ignoreTranslation: true
4771+
- title: SandboxedInstanceMode
4772+
path: /reference/engine/enums/SandboxedInstanceMode
4773+
type: engineapi
4774+
source: /reference/engine/enums/SandboxedInstanceMode.yaml
4775+
ignoreTranslation: true
47564776
- title: SaveAvatarThumbnailCustomizationFailure
47574777
path: /reference/engine/enums/SaveAvatarThumbnailCustomizationFailure
47584778
type: engineapi

content/en-us/animation/editor.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -463,44 +463,44 @@ override the old. For example, a "jump" animation should take priority over an "
463463
Roblox uses seven levels of priority, ordered here from highest to lowest:
464464

465465
<Grid container spacing={2} alignItems="center">
466-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-Highest.png" width="50" style={{float:"right"}} /></Grid>
467-
<Grid item xs={10} sm={11} md={11} lg={11}>
466+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-Highest.png" width="50" style={{float:"right"}} /></Grid>
467+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
468468
**Action4**
469469
</Grid>
470470
</Grid>
471471
<Grid container spacing={2} alignItems="center">
472-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-Higher.png" width="50" style={{float:"right"}} /></Grid>
473-
<Grid item xs={10} sm={11} md={11} lg={11}>
472+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-Higher.png" width="50" style={{float:"right"}} /></Grid>
473+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
474474
**Action3**
475475
</Grid>
476476
</Grid>
477477
<Grid container spacing={2} alignItems="center">
478-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-High.png" width="50" style={{float:"right"}} /></Grid>
479-
<Grid item xs={10} sm={11} md={11} lg={11}>
478+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-High.png" width="50" style={{float:"right"}} /></Grid>
479+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
480480
**Action2**
481481
</Grid>
482482
</Grid>
483483
<Grid container spacing={2} alignItems="center">
484-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-Neutral.png" width="50" style={{float:"right"}} /></Grid>
485-
<Grid item xs={10} sm={11} md={11} lg={11}>
484+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-Neutral.png" width="50" style={{float:"right"}} /></Grid>
485+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
486486
**Action**
487487
</Grid>
488488
</Grid>
489489
<Grid container spacing={2} alignItems="center">
490-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-Low.png" width="50" style={{float:"right"}} /></Grid>
491-
<Grid item xs={10} sm={11} md={11} lg={11}>
490+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-Low.png" width="50" style={{float:"right"}} /></Grid>
491+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
492492
**Movement**
493493
</Grid>
494494
</Grid>
495495
<Grid container spacing={2} alignItems="center">
496-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-Lower.png" width="50" style={{float:"right"}} /></Grid>
497-
<Grid item xs={10} sm={11} md={11} lg={11}>
496+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-Lower.png" width="50" style={{float:"right"}} /></Grid>
497+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
498498
**Idle**
499499
</Grid>
500500
</Grid>
501501
<Grid container spacing={2} alignItems="center">
502-
<Grid item xs={2} sm={1} md={1} lg={1}><img src="../assets/misc/Arrow-Lowest.png" width="50" style={{float:"right"}} /></Grid>
503-
<Grid item xs={10} sm={11} md={11} lg={11}>
502+
<Grid item XSmall={2} Medium={1} Large={1} XLarge={1}><img src="../assets/misc/Arrow-Lowest.png" width="50" style={{float:"right"}} /></Grid>
503+
<Grid item XSmall={10} Medium={11} Large={11} XLarge={11}>
504504
**Core**
505505
</Grid>
506506
</Grid>

0 commit comments

Comments
 (0)