Skip to content

Commit a011195

Browse files
mjmvisserMark Visser
authored andcommitted
Merge pull request #454 from Unity-Technologies/DCC-879-polish-for-verified-package
polish for verified package
2 parents 47adfc0 + fdb825f commit a011195

File tree

162 files changed

+642
-391
lines changed

Some content is hidden

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

162 files changed

+642
-391
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ TestProjects/FbxTests/Assets/Plugins*
7272
**/_safe_to_delete__*
7373
.DS_Store
7474
FbxExportSettings.asset
75+
**/ValidationSuiteResults/**
76+
TestProjects/FbxTests/Logs/*

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changes in Fbx Exporter
22

3+
## [2.0.1-preview.3] - 2018-01-24
4+
CHANGES
5+
* Moved tests to separate .tests package
6+
* Added Timeline dependency
7+
38
## [2.0.1-preview.2] - 2018-12-05
49
CHANGES
510
* Updated dependency to [email protected]

TestProjects/FbxTests/Assets/Models/Cowboy.meta

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

TestProjects/FbxTests/Assets/Models/Cowboy/Materials.meta

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

TestProjects/FbxTests/Assets/Models/DefaultMale/DefaultMale.prefab.meta

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

TestProjects/FbxTests/Assets/Models/Player/Player.prefab.meta

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

TestProjects/FbxTests/Assets/Models/Player/PlayerAlbedo.png.meta

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

TestProjects/FbxTests/Packages/manifest.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"dependencies": {
3-
"com.autodesk.fbx": "2.0.0-preview",
4-
"com.unity.formats.fbx": "file:../../../build/install/com.unity.formats.fbx",
53
"com.unity.ads": "2.0.8",
6-
"com.unity.analytics": "2.0.16",
7-
"com.unity.package-manager-ui": "1.9.11",
8-
"com.unity.purchasing": "2.0.3",
9-
"com.unity.textmeshpro": "1.2.4",
4+
"com.unity.analytics": "3.2.2",
5+
"com.unity.collab-proxy": "1.2.15",
6+
"com.unity.formats.fbx": "file:../../../build/install/com.unity.formats.fbx",
7+
"com.unity.formats.fbx.tests": "file:../../../com.unity.formats.fbx.tests",
8+
"com.unity.package-manager-ui": "2.1.1",
9+
"com.unity.package-validation-suite": "0.4.0-preview.13",
10+
"com.unity.purchasing": "2.0.1",
11+
"com.unity.textmeshpro": "1.3.0",
12+
"com.unity.timeline": "1.0.0",
1013
"com.unity.modules.ai": "1.0.0",
1114
"com.unity.modules.animation": "1.0.0",
1215
"com.unity.modules.assetbundle": "1.0.0",
@@ -38,5 +41,8 @@
3841
"com.unity.modules.wind": "1.0.0",
3942
"com.unity.modules.xr": "1.0.0"
4043
},
41-
"registry": "https://staging-packages.unity.com"
44+
"registry": "https://staging-packages.unity.com",
45+
"testables": [
46+
"com.unity.formats.fbx.tests"
47+
]
4248
}

TestProjects/FbxTests/ProjectSettings/ProjectSettings.asset

Lines changed: 34 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ PlayerSettings:
6363
use32BitDisplayBuffer: 1
6464
preserveFramebufferAlpha: 0
6565
disableDepthAndStencilBuffers: 0
66+
androidStartInFullscreen: 1
67+
androidRenderOutsideSafeArea: 0
6668
androidBlitType: 0
6769
defaultIsNativeResolution: 1
6870
macRetinaSupport: 1
@@ -96,9 +98,6 @@ PlayerSettings:
9698
xboxEnableGuest: 0
9799
xboxEnablePIXSampling: 0
98100
metalFramebufferOnly: 0
99-
n3dsDisableStereoscopicView: 0
100-
n3dsEnableSharedListOpt: 1
101-
n3dsEnableVSync: 0
102101
xboxOneResolution: 0
103102
xboxOneSResolution: 0
104103
xboxOneXResolution: 3
@@ -107,11 +106,7 @@ PlayerSettings:
107106
xboxOneDisableEsram: 0
108107
xboxOnePresentImmediateThreshold: 0
109108
switchQueueCommandMemory: 0
110-
videoMemoryForVertexBuffers: 0
111-
psp2PowerMode: 0
112-
psp2AcquireBGM: 1
113109
vulkanEnableSetSRGBWrite: 0
114-
vulkanUseSWCommandBuffers: 0
115110
m_SupportedAspectRatios:
116111
4:3: 1
117112
5:4: 1
@@ -125,6 +120,7 @@ PlayerSettings:
125120
m_HolographicPauseOnTrackingLoss: 1
126121
xboxOneDisableKinectGpuReservation: 0
127122
xboxOneEnable7thCore: 1
123+
isWsaHolographicRemotingEnabled: 0
128124
vrSettings:
129125
cardboard:
130126
depthFormat: 0
@@ -144,6 +140,7 @@ PlayerSettings:
144140
dashSupport: 0
145141
enable360StereoCapture: 0
146142
protectGraphicsMemory: 0
143+
enableFrameTimingStats: 0
147144
useHDRDisplay: 0
148145
m_ColorGamuts: 00000000
149146
targetPixelDensity: 30
@@ -168,7 +165,7 @@ PlayerSettings:
168165
StripUnusedMeshComponents: 0
169166
VertexChannelCompressionMask: 4054
170167
iPhoneSdkVersion: 988
171-
iOSTargetOSVersionString: 8.0
168+
iOSTargetOSVersionString: 9.0
172169
tvOSSdkVersion: 0
173170
tvOSRequireExtendedGameController: 0
174171
tvOSTargetOSVersionString: 9.0
@@ -234,7 +231,6 @@ PlayerSettings:
234231
appleEnableAutomaticSigning: 0
235232
iOSRequireARKit: 0
236233
appleEnableProMotion: 0
237-
vulkanEditorSupport: 0
238234
clonedFromGUID: 00000000000000000000000000000000
239235
templatePackageId:
240236
templateDefaultScene:
@@ -391,6 +387,7 @@ PlayerSettings:
391387
switchAllowsVideoCapturing: 1
392388
switchAllowsRuntimeAddOnContentInstall: 0
393389
switchDataLossConfirmation: 0
390+
switchUserAccountLockEnabled: 0
394391
switchSupportedNpadStyles: 3
395392
switchNativeFsCacheSize: 32
396393
switchIsHoldTypeHorizontal: 0
@@ -451,6 +448,7 @@ PlayerSettings:
451448
ps4pnGameCustomData: 1
452449
playerPrefsSupport: 0
453450
enableApplicationExit: 0
451+
resetTempFolder: 1
454452
restrictedAudioUsageRights: 0
455453
ps4UseResolutionFallback: 0
456454
ps4ReprojectionSupport: 0
@@ -474,53 +472,6 @@ PlayerSettings:
474472
ps4attribEyeToEyeDistanceSettingVR: 0
475473
ps4IncludedModules: []
476474
monoEnv:
477-
psp2Splashimage: {fileID: 0}
478-
psp2NPTrophyPackPath:
479-
psp2NPSupportGBMorGJP: 0
480-
psp2NPAgeRating: 12
481-
psp2NPTitleDatPath:
482-
psp2NPCommsID:
483-
psp2NPCommunicationsID:
484-
psp2NPCommsPassphrase:
485-
psp2NPCommsSig:
486-
psp2ParamSfxPath:
487-
psp2ManualPath:
488-
psp2LiveAreaGatePath:
489-
psp2LiveAreaBackroundPath:
490-
psp2LiveAreaPath:
491-
psp2LiveAreaTrialPath:
492-
psp2PatchChangeInfoPath:
493-
psp2PatchOriginalPackage:
494-
psp2PackagePassword: WRK5RhRXdCdG5nG5azdNMK66MuCV6GXi
495-
psp2KeystoneFile:
496-
psp2MemoryExpansionMode: 0
497-
psp2DRMType: 0
498-
psp2StorageType: 0
499-
psp2MediaCapacity: 0
500-
psp2DLCConfigPath:
501-
psp2ThumbnailPath:
502-
psp2BackgroundPath:
503-
psp2SoundPath:
504-
psp2TrophyCommId:
505-
psp2TrophyPackagePath:
506-
psp2PackagedResourcesPath:
507-
psp2SaveDataQuota: 10240
508-
psp2ParentalLevel: 1
509-
psp2ShortTitle: Not Set
510-
psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
511-
psp2Category: 0
512-
psp2MasterVersion: 01.00
513-
psp2AppVersion: 01.00
514-
psp2TVBootMode: 0
515-
psp2EnterButtonAssignment: 2
516-
psp2TVDisableEmu: 0
517-
psp2AllowTwitterDialog: 1
518-
psp2Upgradable: 0
519-
psp2HealthWarning: 0
520-
psp2UseLibLocation: 0
521-
psp2InfoBarOnStartup: 0
522-
psp2InfoBarColor: 0
523-
psp2ScriptOptimizationLevel: 2
524475
splashScreenBackgroundSourceLandscape: {fileID: 0}
525476
splashScreenBackgroundSourcePortrait: {fileID: 0}
526477
spritePackerPolicy:
@@ -536,14 +487,16 @@ PlayerSettings:
536487
webGLUseEmbeddedResources: 0
537488
webGLCompressionFormat: 1
538489
webGLLinkerTarget: 1
490+
webGLThreadsSupport: 0
539491
scriptingDefineSymbols: {}
540492
platformArchitecture: {}
541493
scriptingBackend: {}
542494
il2cppCompilerConfiguration: {}
495+
managedStrippingLevel: {}
543496
incrementalIl2cppBuild: {}
544497
allowUnsafeCode: 0
545498
additionalIl2CppArgs:
546-
scriptingRuntimeVersion: 0
499+
scriptingRuntimeVersion: 1
547500
apiCompatibilityLevelPerPlatform: {}
548501
m_RenderingPath: 1
549502
m_MobileRenderingPath: 1
@@ -561,28 +514,20 @@ PlayerSettings:
561514
metroMediumTileShowName: 0
562515
metroLargeTileShowName: 0
563516
metroWideTileShowName: 0
517+
metroSupportStreamingInstall: 0
518+
metroLastRequiredScene: 0
564519
metroDefaultTileSize: 1
565520
metroTileForegroundText: 2
566521
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
567522
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
568523
a: 1}
569524
metroSplashScreenUseBackgroundColor: 0
570525
platformCapabilities: {}
526+
metroTargetDeviceFamilies: {}
571527
metroFTAName:
572528
metroFTAFileTypes: []
573529
metroProtocolName:
574530
metroCompilationOverrides: 1
575-
n3dsUseExtSaveData: 0
576-
n3dsCompressStaticMem: 1
577-
n3dsExtSaveDataNumber: 0x12345
578-
n3dsStackSize: 131072
579-
n3dsTargetPlatform: 2
580-
n3dsRegion: 7
581-
n3dsMediaSize: 0
582-
n3dsLogoStyle: 3
583-
n3dsTitle: GameName
584-
n3dsProductCode:
585-
n3dsApplicationId: 0xFF3FF
586531
XboxOneProductId:
587532
XboxOneUpdateKey:
588533
XboxOneSandboxId:
@@ -608,16 +553,36 @@ PlayerSettings:
608553
XboxOnePersistentLocalStorageSize: 0
609554
XboxOneXTitleMemory: 8
610555
xboxOneScriptCompiler: 0
556+
XboxOneOverrideIdentityName:
611557
vrEditorSettings:
612558
daydream:
613559
daydreamIconForeground: {fileID: 0}
614560
daydreamIconBackground: {fileID: 0}
615561
cloudServicesEnabled: {}
562+
luminIcon:
563+
m_Name:
564+
m_ModelFolderPath:
565+
m_PortalFolderPath:
566+
luminCert:
567+
m_CertPath:
568+
m_PrivateKeyPath:
569+
luminIsChannelApp: 0
570+
luminVersion:
571+
m_VersionCode: 1
572+
m_VersionName:
616573
facebookSdkVersion: 7.9.4
617-
apiCompatibilityLevel: 2
574+
facebookAppId:
575+
facebookCookies: 1
576+
facebookLogging: 1
577+
facebookStatus: 1
578+
facebookXfbml: 0
579+
facebookFrictionlessRequests: 1
580+
apiCompatibilityLevel: 6
618581
cloudProjectId:
582+
framebufferDepthMemorylessMode: 0
619583
projectName:
620584
organizationId:
621585
cloudEnabled: 0
622586
enableNativePlatformBackendsForNewInputSystem: 0
623587
disableOldInputManagerSupport: 0
588+
legacyClampBlendShapeWeights: 1
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
m_EditorVersion: 2018.2.5f1
1+
m_EditorVersion: 2019.2.0a1
2+
m_EditorVersionWithRevision: 2019.2.0a1 (f415bc2e1f10)

0 commit comments

Comments
 (0)