commit 255034875c4d434bc8f24f2b9783f492c1fc7dfe
parent 88bbe3317727ce60218fb25b87c05bdfd786a1a4
Author: PlutoTank <qwolkensperg@gmail.com>
Date: Tue, 14 Apr 2020 17:01:36 -0400
fixing merge
Diffstat:
4 files changed, 15 insertions(+), 77 deletions(-)
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
Binary files differ.
diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -32,8 +32,6 @@
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "lightmapping.autoUnwrapLightmapUV",
"value": "{\"m_Value\":true}"
-<<<<<<< HEAD
-=======
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
@@ -109,7 +107,6 @@
"type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.newShapeColliderType",
"value": "{\"m_Value\":2}"
->>>>>>> Added triggers and lots of backend
}
]
}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -4,7 +4,7 @@
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 20
- productGUID: bd4cd3811ef85fd45a50b729e993ecd9
+ productGUID: a2c44a205904a2c48b34057a9a2251c7
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
AndroidEnableSustainedPerformanceMode: 0
@@ -103,10 +103,7 @@ PlayerSettings:
xboxOneMonoLoggingLevel: 0
xboxOneLoggingLevel: 1
xboxOneDisableEsram: 0
-<<<<<<< HEAD
-=======
xboxOneEnableTypeOptimization: 0
->>>>>>> Added triggers and lots of backend
xboxOnePresentImmediateThreshold: 0
switchQueueCommandMemory: 1048576
switchQueueControlMemory: 16384
@@ -154,14 +151,14 @@ PlayerSettings:
dashSupport: 1
lowOverheadMode: 0
protectedContext: 0
- v2Signing: 0
+ v2Signing: 1
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0
useHDRDisplay: 0
D3DHDRBitDepth: 0
m_ColorGamuts: 00000000
- targetPixelDensity: 30
+ targetPixelDensity: 0
resolutionScalingMode: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
@@ -183,10 +180,10 @@ PlayerSettings:
StripUnusedMeshComponents: 0
VertexChannelCompressionMask: 4054
iPhoneSdkVersion: 988
- iOSTargetOSVersionString: 10.0
+ iOSTargetOSVersionString:
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
- tvOSTargetOSVersionString: 10.0
+ tvOSTargetOSVersionString:
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1
@@ -279,38 +276,8 @@ PlayerSettings:
m_BuildTargetIcons: []
m_BuildTargetPlatformIcons: []
m_BuildTargetBatching: []
- m_BuildTargetGraphicsJobs:
- - m_BuildTarget: MacStandaloneSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: Switch
- m_GraphicsJobs: 0
- - m_BuildTarget: MetroSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: AppleTVSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: BJMSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: LinuxStandaloneSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: PS4Player
- m_GraphicsJobs: 0
- - m_BuildTarget: iOSSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: WindowsStandaloneSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: XboxOnePlayer
- m_GraphicsJobs: 0
- - m_BuildTarget: LuminSupport
- m_GraphicsJobs: 0
- - m_BuildTarget: AndroidPlayer
- m_GraphicsJobs: 0
- - m_BuildTarget: WebGLSupport
- m_GraphicsJobs: 0
- m_BuildTargetGraphicsJobMode:
- - m_BuildTarget: PS4Player
- m_GraphicsJobMode: 0
- - m_BuildTarget: XboxOnePlayer
- m_GraphicsJobMode: 0
+ m_BuildTargetGraphicsJobs: []
+ m_BuildTargetGraphicsJobMode: []
m_BuildTargetGraphicsAPIs: []
m_BuildTargetVRSettings: []
openGLRequireES31: 0
@@ -513,6 +480,7 @@ PlayerSettings:
ps4UseResolutionFallback: 0
ps4ReprojectionSupport: 0
ps4UseAudio3dBackend: 0
+ ps4UseLowGarlicFragmentationMode: 1
ps4SocialScreenEnabled: 0
ps4ScriptOptimizationLevel: 2
ps4Audio3dVirtualSpeakerCount: 14
@@ -551,16 +519,7 @@ PlayerSettings:
webGLLinkerTarget: 1
webGLThreadsSupport: 0
webGLWasmStreaming: 0
- scriptingDefineSymbols:
- 1: UNITY_POST_PROCESSING_STACK_V2
- 7: UNITY_POST_PROCESSING_STACK_V2
- 13: UNITY_POST_PROCESSING_STACK_V2
- 19: UNITY_POST_PROCESSING_STACK_V2
- 21: UNITY_POST_PROCESSING_STACK_V2
- 25: UNITY_POST_PROCESSING_STACK_V2
- 27: UNITY_POST_PROCESSING_STACK_V2
- 28: UNITY_POST_PROCESSING_STACK_V2
- 29: UNITY_POST_PROCESSING_STACK_V2
+ scriptingDefineSymbols: {}
platformArchitecture: {}
scriptingBackend: {}
il2cppCompilerConfiguration: {}
@@ -571,8 +530,7 @@ PlayerSettings:
scriptingRuntimeVersion: 1
gcIncremental: 0
gcWBarrierValidation: 0
- apiCompatibilityLevelPerPlatform:
- Standalone: 3
+ apiCompatibilityLevelPerPlatform: {}
m_RenderingPath: 1
m_MobileRenderingPath: 1
metroPackageName: Slimecing
@@ -631,14 +589,7 @@ PlayerSettings:
daydream:
daydreamIconForeground: {fileID: 0}
daydreamIconBackground: {fileID: 0}
- cloudServicesEnabled:
-<<<<<<< HEAD
- Collab: 1
-=======
- Build: 1
- Collab: 1
- UNet: 1
->>>>>>> Added triggers and lots of backend
+ cloudServicesEnabled: {}
luminIcon:
m_Name:
m_ModelFolderPath:
@@ -651,11 +602,11 @@ PlayerSettings:
m_VersionCode: 1
m_VersionName:
apiCompatibilityLevel: 6
- cloudProjectId: 9065f837-ea6c-4b59-a7b6-7cff282ce513
+ cloudProjectId:
framebufferDepthMemorylessMode: 0
- projectName: Slimecing
- organizationId: plutotank
+ projectName:
+ organizationId:
cloudEnabled: 0
- enableNativePlatformBackendsForNewInputSystem: 1
+ enableNativePlatformBackendsForNewInputSystem: 0
disableOldInputManagerSupport: 0
legacyClampBlendShapeWeights: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,12 +1,2 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-m_EditorVersion: 2019.3.0f6
-m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
-=======
-m_EditorVersion: 2019.3.7f1
-m_EditorVersionWithRevision: 2019.3.7f1 (6437fd74d35d)
->>>>>>> Added triggers and lots of backend
-=======
m_EditorVersion: 2019.3.9f1
m_EditorVersionWithRevision: 2019.3.9f1 (e6e740a1c473)
->>>>>>> oof
