Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Zardian18 committed Oct 1, 2022
1 parent e413058 commit ebdb73a
Show file tree
Hide file tree
Showing 318 changed files with 12,694 additions and 5,223 deletions.
Binary file modified .vs/MaxBay/v16/.suo
Binary file not shown.
4 changes: 3 additions & 1 deletion Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMP_UiFrameRateCounter.cs" />
<Compile Include="Assets\Scripts\Networking\UDPSender.cs" />
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\CameraController.cs" />
<Compile Include="Assets\Scripts\Player Scripts\CollisionScript.cs" />
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\DropdownSample.cs" />
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMP_PhoneNumberValidator.cs" />
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMPro_InstructionOverlay.cs" />
Expand All @@ -100,7 +101,8 @@
<Compile Include="Assets\Scripts\Player Scripts\CameraMovement.cs" />
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\Benchmark01.cs" />
<Compile Include="Assets\TextMesh Pro\Examples &amp; Extras\Scripts\TMP_TextEventCheck.cs" />
<Compile Include="Assets\Scripts\Player Scripts\CollisionScript.cs" />
<Compile Include="Assets\Scripts\Game Manager\MainMenu.cs" />
<Compile Include="Assets\Scripts\Game Manager\Audio.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />
Expand Down
2 changes: 1 addition & 1 deletion Assets/Animations/Helicopter.controller
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_Speed: 5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand Down
10 changes: 4 additions & 6 deletions Assets/Fonts/robot_9000/Robot 9000 SDF.asset
Original file line number Diff line number Diff line change
Expand Up @@ -2486,15 +2486,14 @@ MonoBehaviour:
tabSize: 10
--- !u!21 &5438414665556373001
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Robot 9000 SDF Material
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_ShaderKeywords: GLOW_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -2524,7 +2523,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
Expand All @@ -2542,7 +2540,7 @@ Material:
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowOuter: 0.677
- _GlowPower: 0.75
- _GradientScale: 6
- _LightAngle: 3.1416
Expand Down Expand Up @@ -2581,7 +2579,7 @@ Material:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _GlowColor: {r: 0, g: 0.6845355, b: 1, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
Expand Down
Binary file modified Assets/Models/obstacles.blend
Binary file not shown.
31 changes: 30 additions & 1 deletion Assets/Models/obstacles.blend.meta

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

Binary file modified Assets/Models/obstacles.blend1
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Music.meta

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

Binary file added Assets/Music/Dream Sailing.wav
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Music/Dream Sailing.wav.meta

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

Loading

0 comments on commit ebdb73a

Please sign in to comment.