diff options
author | Jakob Stendahl <jakst070500@ntvgs.no> | 2017-09-29 12:42:11 +0200 |
---|---|---|
committer | Jakob Stendahl <jakst070500@ntvgs.no> | 2017-09-29 12:42:11 +0200 |
commit | 76cf99ade6530bdad81088295fb4cf73f5c5b118 (patch) | |
tree | e3cf549687d164c11d6b292d771534e98bcc97a8 /td/ProjectSettings | |
parent | 608b6a0e692a580f0dfabef0b2ef1a59f0a37234 (diff) | |
parent | 9a00d03f80eee94c9fe52f832a0127d9375ad375 (diff) | |
download | TD-76cf99ade6530bdad81088295fb4cf73f5c5b118.tar.gz TD-76cf99ade6530bdad81088295fb4cf73f5c5b118.zip |
Merge branch 'master' of https://github.com/JakobS1n/unityTest
Diffstat (limited to 'td/ProjectSettings')
16 files changed, 1 insertions, 0 deletions
diff --git a/td/ProjectSettings/AudioManager.asset b/td/ProjectSettings/AudioManager.asset Binary files differnew file mode 100644 index 0000000..825ca08 --- /dev/null +++ b/td/ProjectSettings/AudioManager.asset diff --git a/td/ProjectSettings/ClusterInputManager.asset b/td/ProjectSettings/ClusterInputManager.asset Binary files differnew file mode 100644 index 0000000..2b2644d --- /dev/null +++ b/td/ProjectSettings/ClusterInputManager.asset diff --git a/td/ProjectSettings/DynamicsManager.asset b/td/ProjectSettings/DynamicsManager.asset Binary files differnew file mode 100644 index 0000000..0f724e1 --- /dev/null +++ b/td/ProjectSettings/DynamicsManager.asset diff --git a/td/ProjectSettings/EditorBuildSettings.asset b/td/ProjectSettings/EditorBuildSettings.asset Binary files differnew file mode 100644 index 0000000..ca714a6 --- /dev/null +++ b/td/ProjectSettings/EditorBuildSettings.asset diff --git a/td/ProjectSettings/EditorSettings.asset b/td/ProjectSettings/EditorSettings.asset Binary files differnew file mode 100644 index 0000000..7456bea --- /dev/null +++ b/td/ProjectSettings/EditorSettings.asset diff --git a/td/ProjectSettings/GraphicsSettings.asset b/td/ProjectSettings/GraphicsSettings.asset Binary files differnew file mode 100644 index 0000000..53048ee --- /dev/null +++ b/td/ProjectSettings/GraphicsSettings.asset diff --git a/td/ProjectSettings/InputManager.asset b/td/ProjectSettings/InputManager.asset Binary files differnew file mode 100644 index 0000000..5342fb7 --- /dev/null +++ b/td/ProjectSettings/InputManager.asset diff --git a/td/ProjectSettings/NavMeshAreas.asset b/td/ProjectSettings/NavMeshAreas.asset Binary files differnew file mode 100644 index 0000000..a92aa3d --- /dev/null +++ b/td/ProjectSettings/NavMeshAreas.asset diff --git a/td/ProjectSettings/NetworkManager.asset b/td/ProjectSettings/NetworkManager.asset Binary files differnew file mode 100644 index 0000000..eef089e --- /dev/null +++ b/td/ProjectSettings/NetworkManager.asset diff --git a/td/ProjectSettings/Physics2DSettings.asset b/td/ProjectSettings/Physics2DSettings.asset Binary files differnew file mode 100644 index 0000000..4bb251e --- /dev/null +++ b/td/ProjectSettings/Physics2DSettings.asset diff --git a/td/ProjectSettings/ProjectSettings.asset b/td/ProjectSettings/ProjectSettings.asset Binary files differnew file mode 100644 index 0000000..472756e --- /dev/null +++ b/td/ProjectSettings/ProjectSettings.asset diff --git a/td/ProjectSettings/ProjectVersion.txt b/td/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..6e4d03d --- /dev/null +++ b/td/ProjectSettings/ProjectVersion.txt @@ -0,0 +1 @@ +m_EditorVersion: 5.6.1f1 diff --git a/td/ProjectSettings/QualitySettings.asset b/td/ProjectSettings/QualitySettings.asset Binary files differnew file mode 100644 index 0000000..eefefb4 --- /dev/null +++ b/td/ProjectSettings/QualitySettings.asset diff --git a/td/ProjectSettings/TagManager.asset b/td/ProjectSettings/TagManager.asset Binary files differnew file mode 100644 index 0000000..2c3af94 --- /dev/null +++ b/td/ProjectSettings/TagManager.asset diff --git a/td/ProjectSettings/TimeManager.asset b/td/ProjectSettings/TimeManager.asset Binary files differnew file mode 100644 index 0000000..0838e4e --- /dev/null +++ b/td/ProjectSettings/TimeManager.asset diff --git a/td/ProjectSettings/UnityConnectSettings.asset b/td/ProjectSettings/UnityConnectSettings.asset Binary files differnew file mode 100644 index 0000000..08a6236 --- /dev/null +++ b/td/ProjectSettings/UnityConnectSettings.asset |