Skip to content

Commit

Permalink
Updated Graphic settings
Browse files Browse the repository at this point in the history
  • Loading branch information
97saundersj committed Jan 12, 2025
1 parent 43f5d74 commit b55bbde
Show file tree
Hide file tree
Showing 9 changed files with 1,892 additions and 13 deletions.
107 changes: 107 additions & 0 deletions Assets/Materials/New Water.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8040469015532205066
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 0
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Water
m_Shader: {fileID: -6465566751694194690, guid: 0f576b1961d8d28448f99050d1430be6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalFromTexture_896cf3e837274c4baa9efa77328b65da_Texture_0_Texture2D:
m_Texture: {fileID: 2800000, guid: f31580b6667a11e48a2d487ce13fbe4c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_564d939f11c048bbad23b765e9efa852_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: db243d2611d444037835ecd4af49e9b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BUILTIN_QueueControl: 0
- _BUILTIN_QueueOffset: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _WaveTime: 0.025
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/New Water.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Prefabs/Grass1.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -466,15 +466,15 @@ LODGroup:
m_AnimateCrossFading: 1
m_LastLODIsBillboard: 0
m_LODs:
- screenRelativeHeight: 0.1
- screenRelativeHeight: 0.02
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 6825869010875276075}
- renderer: {fileID: 7591420650421398524}
- renderer: {fileID: 2071357142682693052}
- renderer: {fileID: 7864605807761953723}
- renderer: {fileID: 623049973162861445}
- screenRelativeHeight: 0.05
- screenRelativeHeight: 0.005
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 6825869010875276075}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scenes/Halo.unity
Git LFS file not shown
2 changes: 2 additions & 0 deletions Assets/Scripts/PauseMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ public void ChangeQualityLevel(int index)

public void Resume()
{
Cursor.lockState = CursorLockMode.Locked;
pauseMenuUI.SetActive(false);
Time.timeScale = 1f; // Resume game time
isPaused = false;
}

public void Pause()
{
Cursor.lockState = CursorLockMode.None;
pauseMenuUI.SetActive(true);
Time.timeScale = 0f; // Pause game time
isPaused = true;
Expand Down
Loading

0 comments on commit b55bbde

Please sign in to comment.