Merge branch 'main' into patch-1

Author: matkeg

content/common/navigation/assets.yaml

@@ -7,7 +7,7 @@ navigation:
   - title: Manage
     path: /projects/assets/manager
     section:
-      - title: Asset manager
+      - title: Asset Manager
         path: /projects/assets/manager
       - title: Toolbox
         path: /projects/assets/toolbox

content/common/navigation/monetize/experiences.yaml

@@ -22,6 +22,8 @@ navigation:
     path: /production/monetization/paid-access-local-currency
   - title: Price optimization
     path: /production/monetization/price-optimization
+  - title: Regional Pricing
+    path: /production/monetization/regional-pricing
 
   - heading: Advertise
   - title: Ads Manager

content/en-us/art/accessories/creating-rigid/importing.md

@@ -24,16 +24,12 @@ To import your asset ([downloadable reference](../../../assets/art/accessories/c
 <AccordionSummary>Add textures manually</AccordionSummary>
 <AccordionDetails>
 
-If textures didn't load correctly, add them manually with the Asset Manager.
+If textures didn't load correctly, add them manually. You may need to save and publish your experience in order to access the [Asset Manager](../../../projects/assets/manager.md).
 
-1.  Open the Asset Manager. You may need to save and publish your experience before accessing your assets.
-2.  In the Asset Manager, select the **Bulk Import** button.
-
-    <img src="../../../assets/studio/asset-manager/Import-Button.png" width = "60%"/>
-
-3.  Upload your image file.
-4.  After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
-5.  In the TextureID property, select the value field and add the assetID of the texture image.
+1.  In the **Asset Manager**, click the **Import** button.
+2.  Upload your image file.
+3.  After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
+4.  In the **TextureID** property, select the value field and add the asset ID of the texture image.
 
 </AccordionDetails>
 </BaseAccordion>

content/en-us/art/accessories/from-existing.md

@@ -205,20 +205,16 @@ To import your asset:
 
 3. Select **Import**. The asset populates in your workspace as a `Class.Model` with the appropriate textures applied as a `Class.SurfaceAppearance`.
 
-   1. If textures didn't load correctly, add them manually. You may need to save and publish your experience in order to access the Asset Manager.
+   1. If textures didn't load correctly, add them manually. You may need to save and publish your experience in order to access the [Asset Manager](../../projects/assets/manager.md).
 
-      1. Open the Asset Manager. You may need to save and publish your experience before accessing your assets.
-      2. In the Asset Manager, select the **Bulk Import** button.
-
-         <img src="../../assets/studio/asset-manager/Import-Button.png" width = "60%"/>
-
-      3. Upload your image files.
-      4. After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
-      5. Add a `Class.SurfaceAppearance` child to your `Class.MeshPart`.
+      1. In the **Asset Manager**, click the **Import** button.
+      2. Upload your image files.
+      3. After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
+      4. Add a `Class.SurfaceAppearance` child to your `Class.MeshPart`.
 
          <img src="../../assets/art/accessories/creating-rigid/Adding-Surface-Appearance.png" />
 
-      6. In the `Class.SurfaceAppearance` properties, click each property value and assign the appropriate texture image from the asset dropdown:
+      5. In the `Class.SurfaceAppearance` properties, click each property value and assign the appropriate texture image from the asset dropdown:
 
          1. Set the **ColorMap** to the **\_ALB** texture image.
          2. Set the **MetalnessMap** to the **\_MTL** texture image.

content/en-us/art/accessories/import-clothing.md

@@ -30,15 +30,11 @@ To import your asset:
 <AccordionDetails>
  If textures didn't load correctly, add them manually. You may need to save and publish your experience in order to access the [Asset Manager](../../projects/assets/manager.md).
 
-1.  Open the Asset Manager. You may need to save and publish your experience before accessing your assets.
-2.  In the Asset Manager, select the **Bulk Import** button.
-
-    <img src="../../assets/studio/asset-manager/Import-Button.png" width = "60%"/>
-
-3.  Upload your image files.
-4.  After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
-5.  If you are using a single basic texture, set the `Class.MeshPart.TextureID` property to your uploaded texture image.
-6.  If you are using PBR Textures:
+1.  In the **Asset Manager**, click the **Import** button.
+2.  Upload your image files.
+3.  After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
+4.  If you are using a single basic texture, set the `Class.MeshPart.TextureID` property to your uploaded texture image.
+5.  If you are using PBR textures:
 
     1. Add a `Class.SurfaceAppearance` child to your `Class.MeshPart`.
 

content/en-us/art/accessories/importing.md

@@ -33,18 +33,14 @@ To import your asset:
 
 If textures didn't load correctly, add them manually. You may need to save and publish your experience in order to access the [Asset Manager](../../projects/assets/manager.md).
 
-1. Open the Asset Manager. You may need to save and publish your experience before accessing your assets.
-2. In the Asset Manager, select the **Bulk Import** button.
-
-   <img src="../../assets/studio/asset-manager/Import-Button.png" width = "60%"/>
-
-3. Upload your image files.
-4. After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
-5. Add a `Class.SurfaceAppearance` child to your `Class.MeshPart`.
+1. In the **Asset Manager**, click the **Import** button.
+2. Upload your image files.
+3. After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
+4. Add a `Class.SurfaceAppearance` child to your `Class.MeshPart`.
 
    <img src="../../assets/art/accessories/creating-rigid/Adding-Surface-Appearance.png" />
 
-6. In the `Class.SurfaceAppearance` properties, click each property value and assign the appropriate texture image from the asset dropdown:
+5. In the `Class.SurfaceAppearance` properties, click each property value and assign the appropriate texture image from the asset dropdown:
 
    1. Set the **ColorMap** to the **\_ALB** texture image.
    2. Set the **MetalnessMap** to the **\_MTL** texture image.

content/en-us/art/characters/import.md

@@ -34,15 +34,11 @@ To import your asset:
 <AccordionDetails>
  If textures didn't load correctly, add them manually. You may need to save and publish your experience in order to access the [Asset Manager](../../projects/assets/manager.md).
 
-1.  Open the Asset Manager. You may need to save and publish your experience before accessing your assets.
-2.  In the Asset Manager, select the **Bulk Import** button.
-
-    <img src="../../assets/studio/asset-manager/Import-Button.png" width = "60%"/>
-
-3.  Upload your image files.
-4.  After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
-5.  If you are using a single basic texture, set the `Class.MeshPart.TextureID` property to your uploaded texture image.
-6.  If you are using PBR Textures:
+1.  In the **Asset Manager**, click the **Import** button.
+2.  Upload your image files.
+3.  After moderation clears for your image, select the `Class.MeshPart` parented within your imported `Class.Model`.
+4.  If you are using a single basic texture, set the `Class.MeshPart.TextureID` property to your uploaded texture image.
+5.  If you are using PBR textures:
 
     1. Add a `Class.SurfaceAppearance` child to your `Class.MeshPart`.
 

content/en-us/art/modeling/3d-importer.md

@@ -78,11 +78,11 @@ The 3D Importer provides the following settings for all meshes:
   </tr>
   <tr>
     <td>Add Model To Inventory</td>
-    <td>If enabled, the 3D Importer adds the model to your Toolbox / Asset Manager inventory as a new asset. By default, this is **enabled**. <br /><br />If disabled, the 3D Importer does not add the asset to your inventory.</td>
+    <td>If enabled, the 3D Importer adds the model to your **Toolbox** and **Asset Manager** inventory as a new asset. By default, this is **enabled**. <br /><br />If disabled, the 3D Importer does not add the asset to your inventory.</td>
   </tr>
   <tr>
     <td>Insert In Workspace</td>
-    <td>If enabled, inserts the model into the Workspace and Toolbox/Asset Manager. By default, this is **enabled**.<br /><br />If disabled, only adds the model to the Toolbox/Asset Manager.</td>
+    <td>If enabled, inserts the model into the `Class.Workspace` as well as your **Toolbox** and **Asset Manager** inventory. By default, this is **enabled**.<br /><br />If disabled, only adds the model to your inventory.</td>
   </tr>
   <tr>
     <td>Insert Using Scene Position</td>

content/en-us/art/modeling/surface-appearance.md

@@ -132,7 +132,7 @@ While albedo maps and generic [non-PBR texture maps](../../parts/textures-decals
 
 #### Alpha modes
 
-For objects that require partial or complete sections of transparency, such as grass, leaves, lace, or decals like dirt or grunge, you can use various **alpha modes** to apply transparency to your color map. If your color map image format supports alpha channels, you can apply a grayscale alpha map where 0.0 is opaque and 1.0 is transparent. Similarly, when using an image format such as a `.png`, any opacity on the color map applies as transparency on the asset.
+For objects that require partial or complete sections of transparency, such as grass, leaves, lace, or decals like dirt or grunge, you can use various **alpha modes** to apply transparency to your color map. If your color map image format supports alpha channels, you can apply a grayscale alpha map where `0.0` is transparent and `1.0` is opaque. Similarly, when using an image format such as a `.png`, any opacity on the color map applies as transparency on the asset.
 
 You can apply transparency in two different behaviors by setting the following `Class.SurfaceAppearance.AlphaMode|AlphaMode` values:
 

content/en-us/art/overview-dcc.md

@@ -38,12 +38,16 @@ Studio provides several tools to get your third-party content into Studio depend
 - Images
 
   - Uploaded textures must follow Studio's [texture specifications](../art/modeling/specifications.md).
-  - Studio's [Asset Manager](../projects/assets/manager.md) supports `.png`, `.jpg`, `.tga`, or `.bmp` file formats and allows for bulk file imports.
+  - Studio's [Asset Manager](../projects/assets/manager.md) supports `.png`, `.jpg`, `.gif`, `.tga`, or `.bmp` file formats and allows for bulk file imports.
 
 - Sounds
 
   - Uploaded sounds must follow Roblox's [sound requirements](../sound/assets.md#requirements).
-  - Studio's [Asset Manager](../projects/assets/manager.md) supports `.mp3`, and `.ogg` file formats and allows for bulk file imports.
+  - Studio's [Asset Manager](../projects/assets/manager.md) supports `.ogg`, `.mp3`, `.flac`, and `.wav` file formats and allows for bulk file imports.
+
+- Video
+
+  - You can import video assets in either `.mp4` or `.mov` format if all of the [requirements](../ui/video-frames.md) are met.
 
 <Alert severity ='warning'>
 Roblox performs asset moderation on upload of any asset type. Roblox can also moderate assets after the initial upload. For more information, see [Asset moderation](../projects/assets/index.md#asset-moderation).