Skip to content

Commit

Permalink
Merge pull request #24 from agi23-g8/fix/smooth_camera
Browse files Browse the repository at this point in the history
[Camera] improving view and movements
  • Loading branch information
GabFrancon authored Dec 11, 2023
2 parents b9a05cb + 36a44b6 commit 345d74e
Show file tree
Hide file tree
Showing 22 changed files with 15,560 additions and 42,850 deletions.
4 changes: 4 additions & 0 deletions Assets/Materials/Environment/Ice.mat
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture2DAsset_61511c51ac0442aa973c4653c954f382_Out_0_Texture2D:
m_Texture: {fileID: 2800000, guid: 125c804c98a3ea54987eb999b8846d3b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Materials/Terrain/SnowyTerrain.mat
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Material:
- _SrcBlendAlpha: 1
- _Surface: 0
- _TessellationAreaRadius: 16
- _TessellationDistance: 70
- _TessellationDistance: 90
- _TessellationFactor: 40
- _WorkflowMode: 1
- _WorldUvOffset: 0
Expand Down
Binary file modified Assets/Models/Terrain/.BlenderSource/TerrainSlope.blend
Binary file not shown.
4 changes: 2 additions & 2 deletions Assets/Prefabs/Interactibles/TemporaryBoost.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6863212460713464106}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 0
Expand Down Expand Up @@ -106,7 +106,7 @@ SphereCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.5
m_Radius: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &3017567034466329923
MonoBehaviour:
Expand Down
Loading

0 comments on commit 345d74e

Please sign in to comment.