From 55fd387a0a324c268a485027cd14bf333951ed9a Mon Sep 17 00:00:00 2001 From: Xevion Date: Tue, 24 Nov 2020 05:33:01 -0600 Subject: [PATCH] gitignore and project meta files (prebranch & stash cleanup) --- Paths/.gitignore | 1 + Paths/Assets/Scenes/Default.unity | 8 ++++---- Paths/ProjectSettings/GraphicsSettings.asset | 3 +++ Paths/ProjectSettings/UnityConnectSettings.asset | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Paths/.gitignore b/Paths/.gitignore index e69de29..f4f31b1 100644 --- a/Paths/.gitignore +++ b/Paths/.gitignore @@ -0,0 +1 @@ +/Assets/TextMesh Pro/** \ No newline at end of file diff --git a/Paths/Assets/Scenes/Default.unity b/Paths/Assets/Scenes/Default.unity index 5e175da..3e12bb7 100644 --- a/Paths/Assets/Scenes/Default.unity +++ b/Paths/Assets/Scenes/Default.unity @@ -250,8 +250,8 @@ MonoBehaviour: gridObject: {fileID: 2092623184} gridController: {fileID: 2092623185} debugText: {fileID: 1436240699} - speed: 1000 - clampIncrement: 1 + speed: 2500 + clampIncrement: 2 --- !u!1 &1436240698 GameObject: m_ObjectHideFlags: 0 @@ -579,8 +579,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gridMaterial: {fileID: 2100000, guid: 780d53bea4df7b0418e9c8ed8afd6410, type: 2} - width: 130 - height: 61 + width: 80 + height: 45 --- !u!23 &2092623186 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Paths/ProjectSettings/GraphicsSettings.asset b/Paths/ProjectSettings/GraphicsSettings.asset index 6c2632a..ab4d074 100644 --- a/Paths/ProjectSettings/GraphicsSettings.asset +++ b/Paths/ProjectSettings/GraphicsSettings.asset @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/Paths/ProjectSettings/UnityConnectSettings.asset b/Paths/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/Paths/ProjectSettings/UnityConnectSettings.asset +++ b/Paths/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events