Skip to content

Commit d8cbba5

Browse files
Borod4rBorod4r
committed
Merged branch develop into master
2 parents 0659c71 + 4234c83 commit d8cbba5

File tree

84 files changed

+1634
-376
lines changed

Some content is hidden

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

84 files changed

+1634
-376
lines changed

‎Assets/Devel/Editor/Data/RainbowFoldersSettings.asset

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,23 @@ MonoBehaviour:
176176
Key: Assets/Devel/Examples/Colors/12. Magenta
177177
SmallIcon: {fileID: 2800000, guid: f14480b09218f3047a15b5ded872de28, type: 3}
178178
LargeIcon: {fileID: 2800000, guid: 38dec0c9e1ada504d98f8a0f4959a215, type: 3}
179+
- Type: 1
180+
Key: Assets/Devel/Examples/Platforms/Android
181+
SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
182+
LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
183+
- Type: 1
184+
Key: Assets/Devel/Examples/Platforms/iOS
185+
SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
186+
LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
187+
- Type: 1
188+
Key: Assets/Devel/Examples/Platforms/Windows
189+
SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
190+
LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}
191+
- Type: 1
192+
Key: Assets/Devel/Examples/Platforms/Mac
193+
SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
194+
LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
195+
- Type: 1
196+
Key: Assets/Devel/Examples/Platforms/WebGL
197+
SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
198+
LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}

‎Assets/Devel/Examples/Platforms.meta

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

‎Assets/Devel/Examples/Platforms/Android.meta

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

‎Assets/Devel/Examples/Platforms/Android/stub.file

Whitespace-only changes.

‎Assets/Devel/Examples/Platforms/Android/stub.file.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/Devel/Examples/Platforms/Mac.meta

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

‎Assets/Devel/Examples/Platforms/Mac/stub.file

Whitespace-only changes.

‎Assets/Devel/Examples/Platforms/Mac/stub.file.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/Devel/Examples/Platforms/WebGL.meta

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

‎Assets/Devel/Examples/Platforms/WebGL/stub.file

Whitespace-only changes.

‎Assets/Devel/Examples/Platforms/WebGL/stub.file.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/Devel/Examples/Platforms/Windows.meta

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

‎Assets/Devel/Examples/Platforms/Windows/stub.file

Whitespace-only changes.

‎Assets/Devel/Examples/Platforms/Windows/stub.file.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/Devel/Examples/Platforms/iOS.meta

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

‎Assets/Devel/Examples/Platforms/iOS/stub.file

Whitespace-only changes.

‎Assets/Devel/Examples/Platforms/iOS/stub.file.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/RainbowFolders/Editor/Data/FolderPlatformsStorage.asset

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_GameObject: {fileID: 0}
9+
m_Enabled: 1
10+
m_EditorHideFlags: 0
11+
m_Script: {fileID: 11500000, guid: 372d6f116aea7bc42982a74242d63567, type: 3}
12+
m_Name: FolderPlatformsStorage
13+
m_EditorClassIdentifier:
14+
PlatformFolderIcons:
15+
- Platform: 0
16+
SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
17+
LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
18+
- Platform: 1
19+
SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
20+
LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
21+
- Platform: 2
22+
SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
23+
LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
24+
- Platform: 3
25+
SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
26+
LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}
27+
- Platform: 4
28+
SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
29+
LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}

‎Assets/RainbowFolders/Editor/Data/FolderPlatformsStorage.asset.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/RainbowFolders/Editor/Data/RainbowFoldersSettings.asset

Lines changed: 58 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,30 @@ MonoBehaviour:
1212
m_Name: RainbowFoldersSettings
1313
m_EditorClassIdentifier:
1414
Folders:
15+
- Type: 0
16+
Key: Audio
17+
SmallIcon: {fileID: 2800000, guid: 4372cfb8a7d3b5b4d9b899147b193270, type: 3}
18+
LargeIcon: {fileID: 2800000, guid: 65e13c9890ffa26478506eda78683d5c, type: 3}
19+
- Type: 0
20+
Key: Editor
21+
SmallIcon: {fileID: 2800000, guid: ec2951dbd8c22234c8fdf92529d860fd, type: 3}
22+
LargeIcon: {fileID: 2800000, guid: ad4412933c34d994a9a6daafb8202f4a, type: 3}
23+
- Type: 0
24+
Key: Data
25+
SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
26+
LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
1527
- Type: 1
1628
Key: Assets/Editor Default Resources
1729
SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
1830
LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
19-
- Type: 0
20-
Key: Prefabs
21-
SmallIcon: {fileID: 2800000, guid: 483d693b3f9d5704b89409016b40bc74, type: 3}
22-
LargeIcon: {fileID: 2800000, guid: fac7470563f79024ebc244b39080448d, type: 3}
23-
- Type: 0
24-
Key: Scenes
25-
SmallIcon: {fileID: 2800000, guid: 40ff06f7c381dcf4391ca8342d04260c, type: 3}
26-
LargeIcon: {fileID: 2800000, guid: f9d86cd8e960f584a9aa5a8ee61c4115, type: 3}
27-
- Type: 0
28-
Key: Scripts
29-
SmallIcon: {fileID: 2800000, guid: ed89c5b2588683046989a2a138f3b343, type: 3}
30-
LargeIcon: {fileID: 2800000, guid: 9fca1a811da70484494d9e10d46e0636, type: 3}
3131
- Type: 0
3232
Key: Extensions
3333
SmallIcon: {fileID: 2800000, guid: 0a498e8f7fbcbef4db91d2d411e3f70f, type: 3}
3434
LargeIcon: {fileID: 2800000, guid: b88339035f924f94eab1e64bac79149f, type: 3}
3535
- Type: 0
36-
Key: Plugins
37-
SmallIcon: {fileID: 2800000, guid: 8f45cff1df9688244b1fa6e2da91e05f, type: 3}
38-
LargeIcon: {fileID: 2800000, guid: 15c3471930a7ff44aa9a30bc21a5ea06, type: 3}
39-
- Type: 0
40-
Key: Textures
41-
SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
42-
LargeIcon: {fileID: 2800000, guid: f61940b61bdca1843bed2dbc93de9038, type: 3}
36+
Key: Fonts
37+
SmallIcon: {fileID: 2800000, guid: 163b4b589845fee47ac105cdfb911b77, type: 3}
38+
LargeIcon: {fileID: 2800000, guid: 87a78956e37a460439f1871712ce87fc, type: 3}
4339
- Type: 0
4440
Key: Icons
4541
SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
@@ -49,29 +45,37 @@ MonoBehaviour:
4945
SmallIcon: {fileID: 2800000, guid: 0508340b76cfbdd43826ca620f578abd, type: 3}
5046
LargeIcon: {fileID: 2800000, guid: a4decc2460e61e44b9ccd3d2d248738b, type: 3}
5147
- Type: 0
52-
Key: Audio
53-
SmallIcon: {fileID: 2800000, guid: 4372cfb8a7d3b5b4d9b899147b193270, type: 3}
54-
LargeIcon: {fileID: 2800000, guid: 65e13c9890ffa26478506eda78683d5c, type: 3}
48+
Key: Meshes
49+
SmallIcon: {fileID: 2800000, guid: 268edea26d8cd504da659cc71a1d8549, type: 3}
50+
LargeIcon: {fileID: 2800000, guid: e69e4447e8078c441b3a955855f4f080, type: 3}
51+
- Type: 0
52+
Key: Plugins
53+
SmallIcon: {fileID: 2800000, guid: 8f45cff1df9688244b1fa6e2da91e05f, type: 3}
54+
LargeIcon: {fileID: 2800000, guid: 15c3471930a7ff44aa9a30bc21a5ea06, type: 3}
55+
- Type: 0
56+
Key: Prefabs
57+
SmallIcon: {fileID: 2800000, guid: 483d693b3f9d5704b89409016b40bc74, type: 3}
58+
LargeIcon: {fileID: 2800000, guid: fac7470563f79024ebc244b39080448d, type: 3}
5559
- Type: 0
5660
Key: Project
5761
SmallIcon: {fileID: 2800000, guid: 36e0a02c0316e0b40bd7ffc8eb437a7f, type: 3}
5862
LargeIcon: {fileID: 2800000, guid: ce20e3678b7748244854c06fcd7d7d00, type: 3}
5963
- Type: 0
60-
Key: Fonts
61-
SmallIcon: {fileID: 2800000, guid: 163b4b589845fee47ac105cdfb911b77, type: 3}
62-
LargeIcon: {fileID: 2800000, guid: 87a78956e37a460439f1871712ce87fc, type: 3}
63-
- Type: 0
64-
Key: Editor
65-
SmallIcon: {fileID: 2800000, guid: ec2951dbd8c22234c8fdf92529d860fd, type: 3}
66-
LargeIcon: {fileID: 2800000, guid: ad4412933c34d994a9a6daafb8202f4a, type: 3}
64+
Key: RainbowFolders
65+
SmallIcon: {fileID: 2800000, guid: 8d50cf779e5b4f54a831bdefc32b044c, type: 3}
66+
LargeIcon: {fileID: 2800000, guid: 5c32cf9ad519d0c4aacb16805c45eab3, type: 3}
6767
- Type: 0
6868
Key: Resources
6969
SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
7070
LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
7171
- Type: 0
72-
Key: Data
73-
SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
74-
LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
72+
Key: Scenes
73+
SmallIcon: {fileID: 2800000, guid: 40ff06f7c381dcf4391ca8342d04260c, type: 3}
74+
LargeIcon: {fileID: 2800000, guid: f9d86cd8e960f584a9aa5a8ee61c4115, type: 3}
75+
- Type: 0
76+
Key: Scripts
77+
SmallIcon: {fileID: 2800000, guid: ed89c5b2588683046989a2a138f3b343, type: 3}
78+
LargeIcon: {fileID: 2800000, guid: 9fca1a811da70484494d9e10d46e0636, type: 3}
7579
- Type: 0
7680
Key: Shaders
7781
SmallIcon: {fileID: 2800000, guid: 015a543b4163bfa498964b0db1004815, type: 3}
@@ -81,10 +85,26 @@ MonoBehaviour:
8185
SmallIcon: {fileID: 2800000, guid: c75be7d9cde129149bb04f51d452d85a, type: 3}
8286
LargeIcon: {fileID: 2800000, guid: 4716b9cfe49343c499142d04bb004e0b, type: 3}
8387
- Type: 0
84-
Key: Meshes
85-
SmallIcon: {fileID: 2800000, guid: 268edea26d8cd504da659cc71a1d8549, type: 3}
86-
LargeIcon: {fileID: 2800000, guid: e69e4447e8078c441b3a955855f4f080, type: 3}
88+
Key: Textures
89+
SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
90+
LargeIcon: {fileID: 2800000, guid: f61940b61bdca1843bed2dbc93de9038, type: 3}
8791
- Type: 0
88-
Key: RainbowFolders
89-
SmallIcon: {fileID: 2800000, guid: 8d50cf779e5b4f54a831bdefc32b044c, type: 3}
90-
LargeIcon: {fileID: 2800000, guid: 5c32cf9ad519d0c4aacb16805c45eab3, type: 3}
92+
Key: Android
93+
SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
94+
LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
95+
- Type: 0
96+
Key: iOS
97+
SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
98+
LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
99+
- Type: 0
100+
Key: Windows
101+
SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
102+
LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}
103+
- Type: 0
104+
Key: Mac
105+
SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
106+
LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
107+
- Type: 0
108+
Key: WebGL
109+
SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
110+
LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}

‎Assets/RainbowFolders/Editor/Icons/Types/Platforms.meta

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

‎Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_16.png

626 Bytes
Loading

‎Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_16.png.meta

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

‎Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_64.png

2.05 KB
Loading

0 commit comments

Comments
 (0)