-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #457 from timcassell/develop
Merge develop to master
- Loading branch information
Showing
254 changed files
with
31,194 additions
and
11,996 deletions.
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
.github/unityci/Unity_2018_Settings/Packages/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "dependencies": { | ||
| "com.timcassell.protopromise": "file:../../Package", | ||
| "com.unity.package-manager-ui": "2.0.13", | ||
| "com.unity.textmeshpro": "1.4.1", | ||
| "com.unity.modules.imageconversion": "1.0.0", | ||
| "com.unity.modules.imgui": "1.0.0", | ||
| "com.unity.modules.ui": "1.0.0", | ||
| "com.unity.modules.unitywebrequest": "1.0.0", | ||
| "com.unity.modules.unitywebrequesttexture": "1.0.0" | ||
| }, | ||
| "testables": [ | ||
| "com.timcassell.protopromise" | ||
| ] | ||
| } |
17 changes: 17 additions & 0 deletions
17
.github/unityci/Unity_2018_Settings/ProjectSettings/AudioManager.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!11 &1 | ||
| AudioManager: | ||
| m_ObjectHideFlags: 0 | ||
| m_Volume: 1 | ||
| Rolloff Scale: 1 | ||
| Doppler Factor: 1 | ||
| Default Speaker Mode: 2 | ||
| m_SampleRate: 0 | ||
| m_DSPBufferSize: 0 | ||
| m_VirtualVoiceCount: 512 | ||
| m_RealVoiceCount: 32 | ||
| m_SpatializerPlugin: | ||
| m_AmbisonicDecoderPlugin: | ||
| m_DisableAudio: 0 | ||
| m_VirtualizeEffects: 1 |
6 changes: 6 additions & 0 deletions
6
.github/unityci/Unity_2018_Settings/ProjectSettings/ClusterInputManager.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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: [] |
29 changes: 29 additions & 0 deletions
29
.github/unityci/Unity_2018_Settings/ProjectSettings/DynamicsManager.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!55 &1 | ||
| PhysicsManager: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 7 | ||
| m_Gravity: {x: 0, y: -9.81, z: 0} | ||
| m_DefaultMaterial: {fileID: 0} | ||
| m_BounceThreshold: 2 | ||
| m_SleepThreshold: 0.005 | ||
| m_DefaultContactOffset: 0.01 | ||
| m_DefaultSolverIterations: 6 | ||
| m_DefaultSolverVelocityIterations: 1 | ||
| m_QueriesHitBackfaces: 0 | ||
| m_QueriesHitTriggers: 1 | ||
| m_EnableAdaptiveForce: 0 | ||
| m_ClothInterCollisionDistance: 0 | ||
| m_ClothInterCollisionStiffness: 0 | ||
| m_ContactsGeneration: 1 | ||
| m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff | ||
| m_AutoSimulation: 1 | ||
| m_AutoSyncTransforms: 1 | ||
| m_ClothInterCollisionSettingsToggle: 0 | ||
| m_ContactPairsMode: 0 | ||
| m_BroadphaseType: 0 | ||
| m_WorldBounds: | ||
| m_Center: {x: 0, y: 0, z: 0} | ||
| m_Extent: {x: 250, y: 250, z: 250} | ||
| m_WorldSubdivisions: 8 |
11 changes: 11 additions & 0 deletions
11
.github/unityci/Unity_2018_Settings/ProjectSettings/EditorBuildSettings.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1045 &1 | ||
| EditorBuildSettings: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 2 | ||
| m_Scenes: | ||
| - enabled: 1 | ||
| path: Assets/Demo/Demo.unity | ||
| guid: 5c627422c6d261241b596eecfb01db3c | ||
| m_configObjects: {} |
21 changes: 21 additions & 0 deletions
21
.github/unityci/Unity_2018_Settings/ProjectSettings/EditorSettings.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!159 &1 | ||
| EditorSettings: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 7 | ||
| m_ExternalVersionControlSupport: Hidden Meta Files | ||
| m_SerializationMode: 2 | ||
| m_LineEndingsForNewScripts: 2 | ||
| m_DefaultBehaviorMode: 0 | ||
| m_SpritePackerMode: 0 | ||
| m_SpritePackerPaddingPower: 1 | ||
| m_EtcTextureCompressorBehavior: 1 | ||
| m_EtcTextureFastCompressor: 1 | ||
| m_EtcTextureNormalCompressor: 2 | ||
| m_EtcTextureBestCompressor: 4 | ||
| m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp | ||
| m_ProjectGenerationRootNamespace: | ||
| m_UserGeneratedProjectSuffix: | ||
| m_CollabEditorSettings: | ||
| inProgressEnabled: 1 |
61 changes: 61 additions & 0 deletions
61
.github/unityci/Unity_2018_Settings/ProjectSettings/GraphicsSettings.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!30 &1 | ||
| GraphicsSettings: | ||
| m_ObjectHideFlags: 0 | ||
| serializedVersion: 12 | ||
| m_Deferred: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_DeferredReflections: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_ScreenSpaceShadows: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_LegacyDeferred: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_DepthNormals: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_MotionVectors: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_LightHalo: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_LensFlare: | ||
| m_Mode: 1 | ||
| m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_AlwaysIncludedShaders: | ||
| - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} | ||
| - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_PreloadedShaders: [] | ||
| m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, | ||
| type: 0} | ||
| m_CustomRenderPipeline: {fileID: 0} | ||
| m_TransparencySortMode: 0 | ||
| m_TransparencySortAxis: {x: 0, y: 0, z: 1} | ||
| m_DefaultRenderingPath: 1 | ||
| m_DefaultMobileRenderingPath: 1 | ||
| m_TierSettings: [] | ||
| m_LightmapStripping: 0 | ||
| m_FogStripping: 0 | ||
| m_InstancingStripping: 0 | ||
| m_LightmapKeepPlain: 1 | ||
| m_LightmapKeepDirCombined: 1 | ||
| m_LightmapKeepDynamicPlain: 1 | ||
| m_LightmapKeepDynamicDirCombined: 1 | ||
| m_LightmapKeepShadowMask: 1 | ||
| m_LightmapKeepSubtractive: 1 | ||
| m_FogKeepLinear: 1 | ||
| m_FogKeepExp: 1 | ||
| m_FogKeepExp2: 1 | ||
| m_AlbedoSwatchInfos: [] | ||
| m_LightsUseLinearIntensity: 0 | ||
| m_LightsUseColorTemperature: 0 |
Oops, something went wrong.