Skip to content

Commit de9c827

Browse files
LenaTevarLenaTevar
committed
Fixed car bug with rigidbody in ground
1 parent 72aac03 commit de9c827

File tree

981 files changed

+77385
-2279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

981 files changed

+77385
-2279
lines changed

Diff for: ‎Magazon/.vs/Magazon/v16/.suo

21 KB
Binary file not shown.

Diff for: ‎Magazon/.vs/Magazon/v16/Server/sqlite3/storage.ide

28 KB
Binary file not shown.

Diff for: ‎Magazon/Assembly-CSharp.csproj

+37-13
Original file line numberDiff line numberDiff line change
@@ -106,20 +106,44 @@
106106
<Compile Include="Assets\Cinemachine\Timeline\CinemachineMixer.cs" />
107107
<Compile Include="Assets\Cinemachine\Timeline\CinemachineShot.cs" />
108108
<Compile Include="Assets\Cinemachine\Timeline\CinemachineTrack.cs" />
109-
<Compile Include="Assets\Scripts\CarMovementController.cs" />
110-
<Compile Include="Assets\Scripts\GUIController.cs" />
111-
<Compile Include="Assets\Scripts\LevelController.cs" />
112-
<Compile Include="Assets\Scripts\ObjectiveController.cs" />
113-
<Compile Include="Assets\Scripts\ParcelController.cs" />
114-
<Compile Include="Assets\Scripts\PathController.cs" />
115-
<Compile Include="Assets\Scripts\RobustParcelController.cs" />
116-
<Compile Include="Assets\Scripts\ShootParcelController.cs" />
117-
<Compile Include="Assets\Scripts\Sound.cs" />
118-
<Compile Include="Assets\Scripts\SoundController.cs" />
119-
<Compile Include="Assets\Scripts\SoundVanController.cs" />
120-
<Compile Include="Assets\Scripts\VanMovementController.cs" />
121-
<Compile Include="Assets\Scripts\VanRadar.cs" />
109+
<Compile Include="Assets\Scripts\LevelScripts\CarCollider.cs" />
110+
<Compile Include="Assets\Scripts\LevelScripts\CarMovementController.cs" />
111+
<Compile Include="Assets\Scripts\LevelScripts\GUIController.cs" />
112+
<Compile Include="Assets\Scripts\LevelScripts\LevelController.cs" />
113+
<Compile Include="Assets\Scripts\LevelScripts\ObjectiveController.cs" />
114+
<Compile Include="Assets\Scripts\LevelScripts\Parcel.cs" />
115+
<Compile Include="Assets\Scripts\LevelScripts\ParcelController.cs" />
116+
<Compile Include="Assets\Scripts\LevelScripts\PathController.cs" />
117+
<Compile Include="Assets\Scripts\LevelScripts\PropColliderController.cs" />
118+
<Compile Include="Assets\Scripts\LevelScripts\ReplayLevel.cs" />
119+
<Compile Include="Assets\Scripts\LevelScripts\RobustParcelController.cs" />
120+
<Compile Include="Assets\Scripts\LevelScripts\ShootParcelController.cs" />
121+
<Compile Include="Assets\Scripts\LevelScripts\Sound.cs" />
122+
<Compile Include="Assets\Scripts\LevelScripts\SoundController.cs" />
123+
<Compile Include="Assets\Scripts\LevelScripts\SoundVanController.cs" />
124+
<Compile Include="Assets\Scripts\LevelScripts\VanMovementController.cs" />
125+
<Compile Include="Assets\Scripts\LevelScripts\VanRadar.cs" />
126+
<Compile Include="Assets\Scripts\MainShell\MainShellButtons.cs" />
127+
<Compile Include="Assets\Scripts\Tutorial\TutorialManager.cs" />
128+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMPro.cginc" />
129+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Overlay.shader" />
130+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_Bitmap.shader" />
122131
<None Include="Assets\Cinemachine\ReleaseNotes.txt" />
132+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
133+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
134+
<None Include="Assets\Imports\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
135+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
136+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF.shader" />
137+
<None Include="Assets\Imports\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
138+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMPro_Properties.cginc" />
139+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMPro_Surface.cginc" />
140+
<None Include="Assets\Imports\TextMesh Pro\Resources\LineBreaking Following Characters.txt" />
141+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Masking.shader" />
142+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF Overlay.shader" />
143+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Mobile.shader" />
144+
<None Include="Assets\Imports\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
145+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile.shader" />
146+
<None Include="Assets\Imports\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
123147
<Reference Include="Unity.Timeline.Editor">
124148
<HintPath>C:/Users/hteva/MyFiles/LNU/Unity/Project/Magazon/Magazon/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
125149
</Reference>

Diff for: ‎Magazon/Assets/Imports/CrowArt - PBR Cardboard Box/Prefabs/RobustParcel.prefab

+4-1
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,12 @@ MonoBehaviour:
122122
m_Script: {fileID: 11500000, guid: 7d4172135bc8673499f61112c9453ed2, type: 3}
123123
m_Name:
124124
m_EditorClassIdentifier:
125-
speed: 5
125+
speed: 0.2
126126
Success: {fileID: 1202522996400206, guid: f87e7926fd589094b8a269e14b8bea5e, type: 3}
127+
successSound: good
127128
Failure: {fileID: 1876081050882714, guid: e5df5caad603c8349ba3481b8ded0927, type: 3}
129+
failureSound: fail
130+
lostSound: lost
128131
levelController: {fileID: 0}
129132
deliverAnimation: {fileID: 1491359990764140, guid: 18c0a8b63ea8b4448a595b0c24c1384a,
130133
type: 3}

Diff for: ‎Magazon/Assets/Imports/European Buildings/Materials/fasade_4.mat

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: fasade_4
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 5
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 1
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1

Diff for: ‎Magazon/Assets/Imports/European Buildings/Materials/fasade_6.mat

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: fasade_6
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 5
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 1
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1

Diff for: ‎Magazon/Assets/Imports/European Buildings/Materials/fasade_8.mat

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: fasade_8
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 5
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 1
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1

Diff for: ‎Magazon/Assets/Imports/European Buildings/Materials/fasade_9.mat

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: fasade_9
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 5
12+
m_ShaderKeywords: _EMISSION _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
13+
m_LightmapFlags: 1
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -60,14 +60,14 @@ Material:
6060
- _Cutoff: 0.5
6161
- _DetailNormalMapScale: 1
6262
- _DstBlend: 0
63-
- _GlossMapScale: 1
64-
- _Glossiness: 0.213
63+
- _GlossMapScale: 0
64+
- _Glossiness: 0.625
6565
- _GlossyReflections: 1
6666
- _Metallic: 0
6767
- _Mode: 0
6868
- _OcclusionStrength: 1
6969
- _Parallax: 0.02
70-
- _SmoothnessTextureChannel: 0
70+
- _SmoothnessTextureChannel: 1
7171
- _SpecularHighlights: 1
7272
- _SrcBlend: 1
7373
- _UVSec: 0

Diff for: ‎Magazon/Assets/Imports/FarlandSkies.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo/Materials.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo/Materials/GroundTexture.mat

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: GroundTexture
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 1
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _Control:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailAlbedoMap:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailMask:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _DetailNormalMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _EmissionMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 50, y: 50}
45+
m_Offset: {x: 0, y: 0}
46+
- _MainTex:
47+
m_Texture: {fileID: 2800000, guid: 3833a7e6653de9049bfaf69e25deaf66, type: 3}
48+
m_Scale: {x: 50, y: 50}
49+
m_Offset: {x: 0, y: 0}
50+
- _MetallicGlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _Normal0:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _Normal1:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
- _Normal2:
63+
m_Texture: {fileID: 0}
64+
m_Scale: {x: 1, y: 1}
65+
m_Offset: {x: 0, y: 0}
66+
- _Normal3:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
70+
- _OcclusionMap:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
- _ParallaxMap:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
- _Splat0:
79+
m_Texture: {fileID: 0}
80+
m_Scale: {x: 1, y: 1}
81+
m_Offset: {x: 0, y: 0}
82+
- _Splat1:
83+
m_Texture: {fileID: 0}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- _Splat2:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
90+
- _Splat3:
91+
m_Texture: {fileID: 0}
92+
m_Scale: {x: 1, y: 1}
93+
m_Offset: {x: 0, y: 0}
94+
m_Floats:
95+
- _BumpScale: 1
96+
- _Cutoff: 0.5
97+
- _DetailNormalMapScale: 1
98+
- _DstBlend: 0
99+
- _GlossMapScale: 1
100+
- _Glossiness: 0
101+
- _GlossyReflections: 1
102+
- _Metallic: 0
103+
- _Mode: 0
104+
- _OcclusionStrength: 1
105+
- _Parallax: 0.02
106+
- _Shininess: 0.078125
107+
- _SmoothnessTextureChannel: 0
108+
- _SpecularHighlights: 1
109+
- _SrcBlend: 1
110+
- _UVSec: 0
111+
- _ZWrite: 1
112+
m_Colors:
113+
- _Color: {r: 0.16491634, g: 0.24349815, b: 0.3207547, a: 1}
114+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
115+
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo/Materials/GroundTexture.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo/Models.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo/Models/GroundPlane.fbx

843 KB
Binary file not shown.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Demo/Models/GroundPlane.fbx.meta

+77
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Skyboxes.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Magazon/Assets/Imports/FarlandSkies/Skyboxes/CloudyCrown_01_Midday.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)