Merge pull request #41 from UVASGD/Spencer-Branch

Actual Finishing Touches
UVASGD · May 1, 2021 · 584dfaa · 584dfaa
2 parents f2f9ccf + 32ef064
commit 584dfaa
Show file tree

Hide file tree

Showing 41 changed files with 54 additions and 1 deletion.
diff --git a/New Unity Project.exe b/New Unity Project.exe
diff --git a/New Unity Project_Data/Managed/Assembly-CSharp.dll b/New Unity Project_Data/Managed/Assembly-CSharp.dll
diff --git a/New Unity Project_Data/Managed/Unity.2D.Animation.Runtime.dll b/New Unity Project_Data/Managed/Unity.2D.Animation.Runtime.dll
diff --git a/New Unity Project_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/New Unity Project_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll
diff --git a/New Unity Project_Data/Managed/Unity.2D.Common.Runtime.dll b/New Unity Project_Data/Managed/Unity.2D.Common.Runtime.dll
diff --git a/New Unity Project_Data/Managed/Unity.2D.PixelPerfect.dll b/New Unity Project_Data/Managed/Unity.2D.PixelPerfect.dll
diff --git a/New Unity Project_Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/New Unity Project_Data/Managed/Unity.2D.SpriteShape.Runtime.dll
diff --git a/New Unity Project_Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/New Unity Project_Data/Managed/Unity.InternalAPIEngineBridge.001.dll
diff --git a/New Unity Project_Data/Managed/Unity.Mathematics.dll b/New Unity Project_Data/Managed/Unity.Mathematics.dll
diff --git a/New Unity Project_Data/Managed/Unity.Recorder.Base.dll b/New Unity Project_Data/Managed/Unity.Recorder.Base.dll
diff --git a/New Unity Project_Data/Managed/Unity.Recorder.dll b/New Unity Project_Data/Managed/Unity.Recorder.dll
diff --git a/New Unity Project_Data/Managed/Unity.TextMeshPro.dll b/New Unity Project_Data/Managed/Unity.TextMeshPro.dll
diff --git a/New Unity Project_Data/Managed/Unity.Timeline.dll b/New Unity Project_Data/Managed/Unity.Timeline.dll
diff --git a/New Unity Project_Data/Managed/UnityEngine.AndroidJNIModule.dll b/New Unity Project_Data/Managed/UnityEngine.AndroidJNIModule.dll
diff --git a/New Unity Project_Data/Managed/UnityEngine.CoreModule.dll b/New Unity Project_Data/Managed/UnityEngine.CoreModule.dll
diff --git a/New Unity Project_Data/Managed/UnityEngine.IMGUIModule.dll b/New Unity Project_Data/Managed/UnityEngine.IMGUIModule.dll
diff --git a/New Unity Project_Data/Managed/UnityEngine.TextCoreModule.dll b/New Unity Project_Data/Managed/UnityEngine.TextCoreModule.dll
diff --git a/New Unity Project_Data/Managed/UnityEngine.UI.dll b/New Unity Project_Data/Managed/UnityEngine.UI.dll
diff --git a/New Unity Project_Data/Managed/UnityEngine.UIElementsModule.dll b/New Unity Project_Data/Managed/UnityEngine.UIElementsModule.dll
diff --git a/New Unity Project_Data/Resources/unity_builtin_extra b/New Unity Project_Data/Resources/unity_builtin_extra
diff --git a/New Unity Project_Data/globalgamemanagers b/New Unity Project_Data/globalgamemanagers
diff --git a/New Unity Project_Data/globalgamemanagers.assets b/New Unity Project_Data/globalgamemanagers.assets
diff --git a/New Unity Project_Data/level0 b/New Unity Project_Data/level0
diff --git a/New Unity Project_Data/level1 b/New Unity Project_Data/level1
diff --git a/New Unity Project_Data/level2 b/New Unity Project_Data/level2
diff --git a/New Unity Project_Data/level3 b/New Unity Project_Data/level3
diff --git a/New Unity Project_Data/resources.assets b/New Unity Project_Data/resources.assets
diff --git a/New Unity Project_Data/resources.assets.resS b/New Unity Project_Data/resources.assets.resS
diff --git a/New Unity Project_Data/sharedassets0.assets b/New Unity Project_Data/sharedassets0.assets
diff --git a/New Unity Project_Data/sharedassets0.assets.resS b/New Unity Project_Data/sharedassets0.assets.resS
diff --git a/New Unity Project_Data/sharedassets0.resource b/New Unity Project_Data/sharedassets0.resource
diff --git a/New Unity Project_Data/sharedassets1.assets b/New Unity Project_Data/sharedassets1.assets
diff --git a/New Unity Project_Data/sharedassets1.assets.resS b/New Unity Project_Data/sharedassets1.assets.resS
diff --git a/New Unity Project_Data/sharedassets2.assets b/New Unity Project_Data/sharedassets2.assets
diff --git a/New Unity Project_Data/sharedassets2.assets.resS b/New Unity Project_Data/sharedassets2.assets.resS
diff --git a/New Unity Project_Data/sharedassets3.assets b/New Unity Project_Data/sharedassets3.assets
diff --git a/New Unity Project_Data/sharedassets3.assets.resS b/New Unity Project_Data/sharedassets3.assets.resS
diff --git a/Unity/Assets/Scripts/GameManager.cs b/Unity/Assets/Scripts/GameManager.cs
@@ -43,6 +43,9 @@ void Start()
     // Update is called once per frame
     void Update()
     {
+        if(Input.GetKey("escape")){
+            Application.Quit();
+        }
         // UpdateLevel();
     }
 

diff --git a/Unity/ProjectSettings/GraphicsSettings.asset b/Unity/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 13
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -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}
@@ -55,3 +58,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0
+  m_AllowEnlightenSupportForUpgradedProject: 1
diff --git a/UnityCrashHandler32.exe b/UnityCrashHandler32.exe
diff --git a/UnityPlayer.dll b/UnityPlayer.dll