Skip to content

Commit 12eccc4

Browse files
dbirmandbirman
committed
Merge branch 'develop'
2 parents 6c5e2bc + 7ab17a0 commit 12eccc4

File tree

810 files changed

+34101
-11972
lines changed

Some content is hidden

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

810 files changed

+34101
-11972
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,4 @@ Assets/StreamingAssets/catalog.bin.meta
160160
Assets/StreamingAssets/catalog.bin
161161
Assets/Resources/PerformanceTestRunInfo.json.meta
162162
Assets/Resources/PerformanceTestRunInfo.json
163+
Assets/CleanFlatUI/*

‎Assets/BuildConfig_WebGL.buildconfiguration‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@
1313
"$version": 1,
1414
"BuildCurrentScene": true,
1515
"SceneInfos": []
16+
},
17+
{
18+
"$type": "Unity.Build.Classic.ClassicScriptingSettings, Unity.Build.Classic",
19+
"ScriptingBackend": 1,
20+
"Il2CppCompilerConfiguration": 1,
21+
"UseIncrementalGC": true
22+
},
23+
{
24+
"$type": "Unity.Build.Classic.ClassicCodeStrippingOptions, Unity.Build.Classic",
25+
"StripEngineCode": true,
26+
"ManagedStrippingLevel": 4
1627
}
1728
]
1829
}

Assets/UXIcons/Assets/UX/Icons.meta renamed to Assets/CleanFlatUI.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/TrajectoryPlanner/Controllers.meta renamed to Assets/Materials/Axis.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/Axis/APControlMaterial.mat‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: APControlMaterial
11+
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12+
m_ValidKeywords:
13+
- _RECEIVE_SHADOWS_OFF
14+
m_InvalidKeywords: []
15+
m_LightmapFlags: 4
16+
m_EnableInstancingVariants: 0
17+
m_DoubleSidedGI: 0
18+
m_CustomRenderQueue: 2000
19+
stringTagMap:
20+
RenderType: Opaque
21+
disabledShaderPasses: []
22+
m_SavedProperties:
23+
serializedVersion: 3
24+
m_TexEnvs:
25+
- _BaseMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _BumpMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailAlbedoMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailMask:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailNormalMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _EmissionMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _MainTex:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _MetallicGlossMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _OcclusionMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _ParallaxMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _SpecGlossMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- unity_Lightmaps:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- unity_LightmapsInd:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- unity_ShadowMasks:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
82+
m_Floats:
83+
- _AlphaClip: 0
84+
- _Blend: 0
85+
- _BumpScale: 1
86+
- _ClearCoatMask: 0
87+
- _ClearCoatSmoothness: 0
88+
- _Cull: 2
89+
- _Cutoff: 0.5
90+
- _DetailAlbedoMapScale: 1
91+
- _DetailNormalMapScale: 1
92+
- _DstBlend: 0
93+
- _EnvironmentReflections: 1
94+
- _GlossMapScale: 0
95+
- _Glossiness: 0
96+
- _GlossinessSource: 0
97+
- _GlossyReflections: 0
98+
- _Metallic: 0
99+
- _OcclusionStrength: 1
100+
- _Parallax: 0.005
101+
- _QueueOffset: 0
102+
- _ReceiveShadows: 0
103+
- _SampleGI: 0
104+
- _Shininess: 0
105+
- _Smoothness: 0.5
106+
- _SmoothnessSource: 0
107+
- _SmoothnessTextureChannel: 0
108+
- _SpecSource: 0
109+
- _SpecularHighlights: 1
110+
- _SrcBlend: 1
111+
- _Surface: 0
112+
- _WorkflowMode: 1
113+
- _ZWrite: 1
114+
m_Colors:
115+
- _BaseColor: {r: 1, g: 0.32156864, b: 0.32156864, a: 1}
116+
- _Color: {r: 1, g: 0.32156864, b: 0.32156864, a: 1}
117+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
118+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
119+
m_BuildTextureStacks: []
120+
--- !u!114 &1532702937137222043
121+
MonoBehaviour:
122+
m_ObjectHideFlags: 11
123+
m_CorrespondingSourceObject: {fileID: 0}
124+
m_PrefabInstance: {fileID: 0}
125+
m_PrefabAsset: {fileID: 0}
126+
m_GameObject: {fileID: 0}
127+
m_Enabled: 1
128+
m_EditorHideFlags: 0
129+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
130+
m_Name:
131+
m_EditorClassIdentifier:
132+
version: 5

‎Assets/Materials/Axis/APControlMaterial.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/Axis/APFlatMaterial.mat‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-9164551020563284735
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 5
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: APFlatMaterial
24+
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
25+
m_ValidKeywords: []
26+
m_InvalidKeywords: []
27+
m_LightmapFlags: 4
28+
m_EnableInstancingVariants: 0
29+
m_DoubleSidedGI: 0
30+
m_CustomRenderQueue: 2000
31+
stringTagMap:
32+
RenderType: Opaque
33+
disabledShaderPasses: []
34+
m_SavedProperties:
35+
serializedVersion: 3
36+
m_TexEnvs:
37+
- _BaseMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _BumpMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailAlbedoMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _DetailMask:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _DetailNormalMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _EmissionMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _MainTex:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _MetallicGlossMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _OcclusionMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- _ParallaxMap:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- _SpecGlossMap:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
- unity_Lightmaps:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
85+
- unity_LightmapsInd:
86+
m_Texture: {fileID: 0}
87+
m_Scale: {x: 1, y: 1}
88+
m_Offset: {x: 0, y: 0}
89+
- unity_ShadowMasks:
90+
m_Texture: {fileID: 0}
91+
m_Scale: {x: 1, y: 1}
92+
m_Offset: {x: 0, y: 0}
93+
m_Ints: []
94+
m_Floats:
95+
- _AlphaClip: 0
96+
- _Blend: 0
97+
- _BlendOp: 0
98+
- _BumpScale: 1
99+
- _ClearCoatMask: 0
100+
- _ClearCoatSmoothness: 0
101+
- _Cull: 2
102+
- _Cutoff: 0.5
103+
- _DetailAlbedoMapScale: 1
104+
- _DetailNormalMapScale: 1
105+
- _DstBlend: 0
106+
- _EnvironmentReflections: 1
107+
- _GlossMapScale: 0
108+
- _Glossiness: 0
109+
- _GlossyReflections: 0
110+
- _Metallic: 0
111+
- _OcclusionStrength: 1
112+
- _Parallax: 0.005
113+
- _QueueOffset: 0
114+
- _ReceiveShadows: 1
115+
- _SampleGI: 0
116+
- _Smoothness: 0.5
117+
- _SmoothnessTextureChannel: 0
118+
- _SpecularHighlights: 1
119+
- _SrcBlend: 1
120+
- _Surface: 0
121+
- _WorkflowMode: 1
122+
- _ZWrite: 1
123+
m_Colors:
124+
- _BaseColor: {r: 1, g: 0.32156864, b: 0.32156864, a: 1}
125+
- _Color: {r: 1, g: 0.32156864, b: 0.32156864, a: 1}
126+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
127+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
128+
m_BuildTextureStacks: []

‎Assets/Materials/Axis/APFlatMaterial.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)