Skip to content
This repository has been archived by the owner on Dec 15, 2017. It is now read-only.

Commit

Permalink
Updated to Unity Editor 5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Youmin Kim committed Jul 1, 2016
1 parent 535324f commit a49ac21
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 59 deletions.
6 changes: 6 additions & 0 deletions friendsmash/ProjectSettings/ClusterInputManager.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!236 &1
ClusterInputManager:
m_ObjectHideFlags: 0
m_Inputs: []
7 changes: 5 additions & 2 deletions friendsmash/ProjectSettings/GraphicsSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
serializedVersion: 5
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
Expand All @@ -21,14 +21,17 @@ GraphicsSettings:
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_ShaderSettings:
useScreenSpaceShadows: 0
m_BuildTargetShaderSettings: []
m_LightmapStripping: 0
m_FogStripping: 0
m_LightmapKeepPlain: 1
m_LightmapKeepDirCombined: 1
m_LightmapKeepDirSeparate: 1
m_LightmapKeepDynamicPlain: 1
m_LightmapKeepDynamicDirCombined: 1
m_LightmapKeepDynamicDirSeparate: 1
m_FogStripping: 0
m_FogKeepLinear: 1
m_FogKeepExp: 1
m_FogKeepExp2: 1
66 changes: 20 additions & 46 deletions friendsmash/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 8
AndroidProfiler: 0
defaultScreenOrientation: 2
targetDevice: 2
targetResolution: 0
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: fb
productName: friendsmash
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_ShowUnitySplashScreen: 1
m_VirtualRealitySplashScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
defaultScreenWidthWeb: 960
Expand Down Expand Up @@ -56,15 +56,19 @@ PlayerSettings:
xboxEnableKinectAutoTracking: 0
xboxEnableFitness: 0
visibleInBackground: 0
allowFullscreenSwitch: 1
macFullscreenMode: 2
d3d9FullscreenMode: 1
d3d11FullscreenMode: 1
xboxSpeechDB: 0
xboxEnableHeadOrientation: 0
xboxEnableGuest: 0
xboxEnablePIXSampling: 0
n3dsDisableStereoscopicView: 0
n3dsEnableSharedListOpt: 1
n3dsEnableVSync: 0
uiUse16BitDepthBuffer: 0
ignoreAlphaClear: 0
xboxOneResolution: 0
ps3SplashScreen: {fileID: 0}
videoMemoryForVertexBuffers: 0
Expand Down Expand Up @@ -113,6 +117,8 @@ PlayerSettings:
m_Bits: 238
iPhoneSdkVersion: 988
iPhoneTargetOSVersion: 22
tvOSSdkVersion: 0
tvOSTargetOSVersion: 900
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1
Expand All @@ -129,6 +135,10 @@ PlayerSettings:
iPadHighResPortraitSplashScreen: {fileID: 0}
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
tvOSSmallIconLayers: []
tvOSLargeIconLayers: []
tvOSTopShelfImageLayers: []
iOSLaunchScreenType: 0
iOSLaunchScreenPortrait: {fileID: 0}
iOSLaunchScreenLandscape: {fileID: 0}
Expand Down Expand Up @@ -254,6 +264,7 @@ PlayerSettings:
wiiUSystemHeapSize: 128
wiiUTVStartupScreen: {fileID: 0}
wiiUGamePadStartupScreen: {fileID: 0}
wiiUDrcBufferDisabled: 0
wiiUProfilerLibPath:
actionOnDotNetUnhandledException: 1
enableInternalProfiler: 0
Expand Down Expand Up @@ -321,16 +332,20 @@ PlayerSettings:
ps4DownloadDataSize: 0
ps4GarlicHeapSize: 2048
ps4Passcode: 5xr84P2R391UXaLHbavJvFZGfO47XWS2
ps4UseDebugIl2cppLibs: 0
ps4pnSessions: 1
ps4pnPresence: 1
ps4pnFriends: 1
ps4pnGameCustomData: 1
playerPrefsSupport: 0
ps4ReprojectionSupport: 0
ps4UseAudio3dBackend: 0
ps4SocialScreenEnabled: 0
ps4Audio3dVirtualSpeakerCount: 14
ps4attribCpuUsage: 0
ps4SocialScreenEnabled: 0
ps4PatchPkgPath:
ps4PatchLatestPkgPath:
ps4PatchChangeinfoPath:
ps4attribUserManagement: 0
ps4attribMoveSupport: 0
ps4attrib3DSupport: 0
Expand Down Expand Up @@ -383,60 +398,20 @@ PlayerSettings:
psp2UseLibLocation: 0
psp2InfoBarOnStartup: 0
psp2InfoBarColor: 0
psp2UseDebugIl2cppLibs: 0
psmSplashimage: {fileID: 0}
spritePackerPolicy:
scriptingDefineSymbols:
4:
metroPackageName: friendsmash_payments_complete
metroPackageLogo:
metroPackageLogo140:
metroPackageLogo180:
metroPackageLogo240:
metroPackageVersion:
metroCertificatePath:
metroCertificatePassword:
metroCertificateSubject:
metroCertificateIssuer:
metroCertificateNotAfter: 0000000000000000
metroApplicationDescription: friendsmash_payments_complete
metroStoreTileLogo80:
metroStoreTileLogo:
metroStoreTileLogo140:
metroStoreTileLogo180:
metroStoreTileWideLogo80:
metroStoreTileWideLogo:
metroStoreTileWideLogo140:
metroStoreTileWideLogo180:
metroStoreTileSmallLogo80:
metroStoreTileSmallLogo:
metroStoreTileSmallLogo140:
metroStoreTileSmallLogo180:
metroStoreSmallTile80:
metroStoreSmallTile:
metroStoreSmallTile140:
metroStoreSmallTile180:
metroStoreLargeTile80:
metroStoreLargeTile:
metroStoreLargeTile140:
metroStoreLargeTile180:
metroStoreSplashScreenImage:
metroStoreSplashScreenImage140:
metroStoreSplashScreenImage180:
metroPhoneAppIcon:
metroPhoneAppIcon140:
metroPhoneAppIcon240:
metroPhoneSmallTile:
metroPhoneSmallTile140:
metroPhoneSmallTile240:
metroPhoneMediumTile:
metroPhoneMediumTile140:
metroPhoneMediumTile240:
metroPhoneWideTile:
metroPhoneWideTile140:
metroPhoneWideTile240:
metroPhoneSplashScreenImage:
metroPhoneSplashScreenImage140:
metroPhoneSplashScreenImage240:
wsaImages: {}
metroTileShortName:
metroCommandLineArgsFile:
metroTileShowName: 1
Expand Down Expand Up @@ -544,7 +519,6 @@ PlayerSettings:
WebGL::emscriptenArgs:
WebGL::template: APPLICATION:Default
additionalIl2CppArgs::additionalIl2CppArgs:
firstStreamedSceneWithResources: 0
cloudProjectId:
projectName:
organizationId:
Expand Down
2 changes: 1 addition & 1 deletion friendsmash/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 5.2.3f1
m_EditorVersion: 5.3.5f1
m_StandardAssetsVersion: 0
10 changes: 0 additions & 10 deletions friendsmash/ProjectSettings/UnityAnalyticsManager.asset

This file was deleted.

14 changes: 14 additions & 0 deletions friendsmash/ProjectSettings/UnityConnectSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!310 &1
UnityConnectSettings:
m_ObjectHideFlags: 0
UnityPurchasingSettings:
m_Enabled: 0
m_TestMode: 0
UnityAnalyticsSettings:
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_TestEventUrl:
m_TestConfigUrl:

0 comments on commit a49ac21

Please sign in to comment.