Skip to content

Commit 59a1fe2

Browse files
authored
Merge branch 'main' into ProtoValence-Mouse-Icon-Compatibility
2 parents b9e7c07 + 00ef057 commit 59a1fe2

File tree

77 files changed

+1042
-234
lines changed

Some content is hidden

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

77 files changed

+1042
-234
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ content/zh-tw/assets/** filter=lfs diff=lfs merge=lfs -text
1111

1212
# Git will always convert line endings to LF on checkout
1313
* text eol=lf
14+
15+
# But treat tarballs as binary (no line ending conversion)
16+
*.tgz binary

content/common/navigation/assets.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ navigation:
2828
path: /art/overview-dcc
2929
- title: Blender
3030
path: /art/blender
31+
- title: Reaper
32+
path: /art/reaper
3133
- title: In-experience
3234
path: /projects/assets/in-experience-asset-creation
3335
- heading: 3D Art

content/common/navigation/cloud/reference.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ navigation:
9090
- heading: Open Cloud API Reference
9191
- title: Cloud
9292
section:
93-
- title: Toolbox service
94-
path: /cloud/api/toolbox-service
9593
- title: Asset delivery
9694
path: /cloud/api/asset-delivery
9795
- title: Badges
@@ -108,6 +106,8 @@ navigation:
108106
path: /cloud/api/localization
109107
- title: Publish
110108
path: /cloud/api/publish
109+
- title: Toolbox service
110+
path: /cloud/api/toolbox-service
111111
- title: Open Cloud v2
112112
section:
113113
- title: All Cloud API # doesn't show anywhere

content/common/navigation/engine/reference.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,6 +2323,11 @@ navigation:
23232323
type: engineapi
23242324
source: /reference/engine/classes/SlidingBallConstraint.yaml
23252325
ignoreTranslation: true
2326+
- title: SlimContentProvider
2327+
path: /reference/engine/classes/SlimContentProvider
2328+
type: engineapi
2329+
source: /reference/engine/classes/SlimContentProvider.yaml
2330+
ignoreTranslation: true
23262331
- title: Smoke
23272332
path: /reference/engine/classes/Smoke
23282333
type: engineapi
@@ -2603,11 +2608,31 @@ navigation:
26032608
type: engineapi
26042609
source: /reference/engine/classes/TerrainDetail.yaml
26052610
ignoreTranslation: true
2611+
- title: TerrainIterateOperation
2612+
path: /reference/engine/classes/TerrainIterateOperation
2613+
type: engineapi
2614+
source: /reference/engine/classes/TerrainIterateOperation.yaml
2615+
ignoreTranslation: true
2616+
- title: TerrainModifyOperation
2617+
path: /reference/engine/classes/TerrainModifyOperation
2618+
type: engineapi
2619+
source: /reference/engine/classes/TerrainModifyOperation.yaml
2620+
ignoreTranslation: true
2621+
- title: TerrainReadOperation
2622+
path: /reference/engine/classes/TerrainReadOperation
2623+
type: engineapi
2624+
source: /reference/engine/classes/TerrainReadOperation.yaml
2625+
ignoreTranslation: true
26062626
- title: TerrainRegion
26072627
path: /reference/engine/classes/TerrainRegion
26082628
type: engineapi
26092629
source: /reference/engine/classes/TerrainRegion.yaml
26102630
ignoreTranslation: true
2631+
- title: TerrainWriteOperation
2632+
path: /reference/engine/classes/TerrainWriteOperation
2633+
type: engineapi
2634+
source: /reference/engine/classes/TerrainWriteOperation.yaml
2635+
ignoreTranslation: true
26112636
- title: TestService
26122637
path: /reference/engine/classes/TestService
26132638
type: engineapi
@@ -4831,6 +4856,11 @@ navigation:
48314856
type: engineapi
48324857
source: /reference/engine/enums/PositionAlignmentMode.yaml
48334858
ignoreTranslation: true
4859+
- title: PreferredInput
4860+
path: /reference/engine/enums/PreferredInput
4861+
type: engineapi
4862+
source: /reference/engine/enums/PreferredInput.yaml
4863+
ignoreTranslation: true
48344864
- title: PreferredTextSize
48354865
path: /reference/engine/enums/PreferredTextSize
48364866
type: engineapi

content/en-us/art/blender.md

Lines changed: 2 additions & 2 deletions

content/en-us/art/reaper.md

Lines changed: 395 additions & 0 deletions

content/en-us/art/validation-errors.md

Lines changed: 11 additions & 7 deletions
Lines changed: 3 additions & 0 deletions
Lines changed: 3 additions & 0 deletions
Lines changed: 3 additions & 0 deletions

0 commit comments

Comments
 (0)