Skip to content

Commit 3712210

Browse files
authored
Merge pull request #32 from dioram/development/3.2
3.2.0-rc1
2 parents b7f3dfc + 30ebce7 commit 3712210

File tree

520 files changed

+37288
-12913
lines changed

Some content is hidden

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

520 files changed

+37288
-12913
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
99
jobs:
1010
buildForSomePlatforms:
11-
name: Build for StandaloneWindows64 on version 2020.2.4f1
11+
name: Build for StandaloneWindows64
1212
runs-on: self-hosted
1313
steps:
1414
- uses: actions/checkout@v2
Binary file not shown.

Assets/Localization/UI Text Shared Data.asset

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,34 @@ MonoBehaviour:
199199
m_Key: Hide axis
200200
m_Metadata:
201201
m_Items: []
202+
- m_Id: 1179022329516032
203+
m_Key: Show source tree
204+
m_Metadata:
205+
m_Items: []
206+
- m_Id: 1180012348837888
207+
m_Key: Tools
208+
m_Metadata:
209+
m_Items: []
210+
- m_Id: 1180093168881664
211+
m_Key: Data tree
212+
m_Metadata:
213+
m_Items: []
214+
- m_Id: 1192124664123392
215+
m_Key: Scene view
216+
m_Metadata:
217+
m_Items: []
218+
- m_Id: 1488487188664320
219+
m_Key: Update
220+
m_Metadata:
221+
m_Items: []
222+
- m_Id: 1499525887954944
223+
m_Key: New releases
224+
m_Metadata:
225+
m_Items: []
226+
- m_Id: 1499634700783616
227+
m_Key: New pre-releases
228+
m_Metadata:
229+
m_Items: []
202230
m_Metadata:
203231
m_Items: []
204232
m_KeyGenerator:

Assets/Localization/UI Text_en.asset

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,34 @@ MonoBehaviour:
206206
m_Localized: Hide axis
207207
m_Metadata:
208208
m_Items: []
209+
- m_Id: 1179022329516032
210+
m_Localized: Show data tree
211+
m_Metadata:
212+
m_Items: []
213+
- m_Id: 1180012348837888
214+
m_Localized: Tools
215+
m_Metadata:
216+
m_Items: []
217+
- m_Id: 1180093168881664
218+
m_Localized: Data tree
219+
m_Metadata:
220+
m_Items: []
221+
- m_Id: 1192124664123392
222+
m_Localized: Scene view
223+
m_Metadata:
224+
m_Items: []
225+
- m_Id: 1488487188664320
226+
m_Localized: Update
227+
m_Metadata:
228+
m_Items: []
229+
- m_Id: 1499525887954944
230+
m_Localized: 'New releases:'
231+
m_Metadata:
232+
m_Items: []
233+
- m_Id: 1499634700783616
234+
m_Localized: 'New pre-releases:'
235+
m_Metadata:
236+
m_Items: []
209237
references:
210238
version: 1
211239
00000000:

Assets/Localization/UI Text_ru.asset

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,35 @@ MonoBehaviour:
216216
m_Localized: "\u0421\u043A\u0440\u044B\u0442\u044C \u043E\u0441\u0438"
217217
m_Metadata:
218218
m_Items: []
219+
- m_Id: 1179022329516032
220+
m_Localized: "\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0434\u0435\u0440\u0435\u0432\u043E
221+
\u0434\u0430\u043D\u043D\u044B\u0445"
222+
m_Metadata:
223+
m_Items: []
224+
- m_Id: 1180012348837888
225+
m_Localized: "\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B"
226+
m_Metadata:
227+
m_Items: []
228+
- m_Id: 1180093168881664
229+
m_Localized: "\u0414\u0435\u0440\u0435\u0432\u043E \u0434\u0430\u043D\u043D\u044B\u0445"
230+
m_Metadata:
231+
m_Items: []
232+
- m_Id: 1192124664123392
233+
m_Localized: "\u0412\u0438\u0434 \u0441\u0446\u0435\u043D\u044B"
234+
m_Metadata:
235+
m_Items: []
236+
- m_Id: 1488487188664320
237+
m_Localized: "\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C"
238+
m_Metadata:
239+
m_Items: []
240+
- m_Id: 1499525887954944
241+
m_Localized: "\u041D\u043E\u0432\u044B\u0435 \u0440\u0435\u043B\u0438\u0437\u044B:"
242+
m_Metadata:
243+
m_Items: []
244+
- m_Id: 1499634700783616
245+
m_Localized: "\u041D\u043E\u0432\u044B\u0435 \u043F\u0440\u0435-\u0440\u0435\u043B\u0438\u0437\u044B"
246+
m_Metadata:
247+
m_Items: []
219248
references:
220249
version: 1
221250
00000000:
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/Observation.mat

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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: Observation
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+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Ints: []
59+
m_Floats:
60+
- _BumpScale: 1
61+
- _Cutoff: 0.5
62+
- _DetailNormalMapScale: 1
63+
- _DstBlend: 0
64+
- _GlossMapScale: 1
65+
- _Glossiness: 0.5
66+
- _GlossyReflections: 1
67+
- _Metallic: 0
68+
- _Mode: 0
69+
- _OcclusionStrength: 1
70+
- _Parallax: 0.02
71+
- _SmoothnessTextureChannel: 0
72+
- _SpecularHighlights: 1
73+
- _SrcBlend: 1
74+
- _UVSec: 0
75+
- _ZWrite: 1
76+
m_Colors:
77+
- _Color: {r: 0, g: 0, b: 0, a: 1}
78+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
79+
m_BuildTextureStacks: []

Assets/Materials/Observation.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/Plugins/HSVPicker/Editor.meta

Lines changed: 0 additions & 5 deletions
This file was deleted.

Assets/Plugins/HSVPicker/Editor/BoxSliderEditor.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)