Merged branch develop into master

Borod4r · Jan 4, 2017 · d8cbba5 · d8cbba5
2 parents 0659c71 + 4234c83
commit d8cbba5
Show file tree

Hide file tree

Showing 84 changed files with 1,634 additions and 376 deletions.
diff --git a/Assets/Devel/Editor/Data/RainbowFoldersSettings.asset b/Assets/Devel/Editor/Data/RainbowFoldersSettings.asset
@@ -176,3 +176,23 @@ MonoBehaviour:
     Key: Assets/Devel/Examples/Colors/12. Magenta
     SmallIcon: {fileID: 2800000, guid: f14480b09218f3047a15b5ded872de28, type: 3}
     LargeIcon: {fileID: 2800000, guid: 38dec0c9e1ada504d98f8a0f4959a215, type: 3}
+  - Type: 1
+    Key: Assets/Devel/Examples/Platforms/Android
+    SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
+    LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
+  - Type: 1
+    Key: Assets/Devel/Examples/Platforms/iOS
+    SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
+  - Type: 1
+    Key: Assets/Devel/Examples/Platforms/Windows
+    SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}
+  - Type: 1
+    Key: Assets/Devel/Examples/Platforms/Mac
+    SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
+  - Type: 1
+    Key: Assets/Devel/Examples/Platforms/WebGL
+    SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}
diff --git a/Assets/Devel/Examples/Platforms.meta b/Assets/Devel/Examples/Platforms.meta
diff --git a/Assets/Devel/Examples/Platforms/Android.meta b/Assets/Devel/Examples/Platforms/Android.meta
diff --git a/Assets/Devel/Examples/Platforms/Android/stub.file b/Assets/Devel/Examples/Platforms/Android/stub.file
diff --git a/Assets/Devel/Examples/Platforms/Android/stub.file.meta b/Assets/Devel/Examples/Platforms/Android/stub.file.meta
diff --git a/Assets/Devel/Examples/Platforms/Mac.meta b/Assets/Devel/Examples/Platforms/Mac.meta
diff --git a/Assets/Devel/Examples/Platforms/Mac/stub.file b/Assets/Devel/Examples/Platforms/Mac/stub.file
diff --git a/Assets/Devel/Examples/Platforms/Mac/stub.file.meta b/Assets/Devel/Examples/Platforms/Mac/stub.file.meta
diff --git a/Assets/Devel/Examples/Platforms/WebGL.meta b/Assets/Devel/Examples/Platforms/WebGL.meta
diff --git a/Assets/Devel/Examples/Platforms/WebGL/stub.file b/Assets/Devel/Examples/Platforms/WebGL/stub.file
diff --git a/Assets/Devel/Examples/Platforms/WebGL/stub.file.meta b/Assets/Devel/Examples/Platforms/WebGL/stub.file.meta
diff --git a/Assets/Devel/Examples/Platforms/Windows.meta b/Assets/Devel/Examples/Platforms/Windows.meta
diff --git a/Assets/Devel/Examples/Platforms/Windows/stub.file b/Assets/Devel/Examples/Platforms/Windows/stub.file
diff --git a/Assets/Devel/Examples/Platforms/Windows/stub.file.meta b/Assets/Devel/Examples/Platforms/Windows/stub.file.meta
diff --git a/Assets/Devel/Examples/Platforms/iOS.meta b/Assets/Devel/Examples/Platforms/iOS.meta
diff --git a/Assets/Devel/Examples/Platforms/iOS/stub.file b/Assets/Devel/Examples/Platforms/iOS/stub.file
diff --git a/Assets/Devel/Examples/Platforms/iOS/stub.file.meta b/Assets/Devel/Examples/Platforms/iOS/stub.file.meta
diff --git a/Assets/RainbowFolders/Editor/Data/FolderPlatformsStorage.asset b/Assets/RainbowFolders/Editor/Data/FolderPlatformsStorage.asset
@@ -0,0 +1,29 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 372d6f116aea7bc42982a74242d63567, type: 3}
+  m_Name: FolderPlatformsStorage
+  m_EditorClassIdentifier: 
+  PlatformFolderIcons:
+  - Platform: 0
+    SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
+    LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
+  - Platform: 1
+    SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
+  - Platform: 2
+    SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
+  - Platform: 3
+    SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}
+  - Platform: 4
+    SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}
diff --git a/Assets/RainbowFolders/Editor/Data/FolderPlatformsStorage.asset.meta b/Assets/RainbowFolders/Editor/Data/FolderPlatformsStorage.asset.meta
diff --git a/Assets/RainbowFolders/Editor/Data/RainbowFoldersSettings.asset b/Assets/RainbowFolders/Editor/Data/RainbowFoldersSettings.asset
@@ -12,34 +12,30 @@ MonoBehaviour:
   m_Name: RainbowFoldersSettings
   m_EditorClassIdentifier: 
   Folders:
+  - Type: 0
+    Key: Audio
+    SmallIcon: {fileID: 2800000, guid: 4372cfb8a7d3b5b4d9b899147b193270, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 65e13c9890ffa26478506eda78683d5c, type: 3}
+  - Type: 0
+    Key: Editor
+    SmallIcon: {fileID: 2800000, guid: ec2951dbd8c22234c8fdf92529d860fd, type: 3}
+    LargeIcon: {fileID: 2800000, guid: ad4412933c34d994a9a6daafb8202f4a, type: 3}
+  - Type: 0
+    Key: Data
+    SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
   - Type: 1
     Key: Assets/Editor Default Resources
     SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
     LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
-  - Type: 0
-    Key: Prefabs
-    SmallIcon: {fileID: 2800000, guid: 483d693b3f9d5704b89409016b40bc74, type: 3}
-    LargeIcon: {fileID: 2800000, guid: fac7470563f79024ebc244b39080448d, type: 3}
-  - Type: 0
-    Key: Scenes
-    SmallIcon: {fileID: 2800000, guid: 40ff06f7c381dcf4391ca8342d04260c, type: 3}
-    LargeIcon: {fileID: 2800000, guid: f9d86cd8e960f584a9aa5a8ee61c4115, type: 3}
-  - Type: 0
-    Key: Scripts
-    SmallIcon: {fileID: 2800000, guid: ed89c5b2588683046989a2a138f3b343, type: 3}
-    LargeIcon: {fileID: 2800000, guid: 9fca1a811da70484494d9e10d46e0636, type: 3}
   - Type: 0
     Key: Extensions
     SmallIcon: {fileID: 2800000, guid: 0a498e8f7fbcbef4db91d2d411e3f70f, type: 3}
     LargeIcon: {fileID: 2800000, guid: b88339035f924f94eab1e64bac79149f, type: 3}
   - Type: 0
-    Key: Plugins
-    SmallIcon: {fileID: 2800000, guid: 8f45cff1df9688244b1fa6e2da91e05f, type: 3}
-    LargeIcon: {fileID: 2800000, guid: 15c3471930a7ff44aa9a30bc21a5ea06, type: 3}
-  - Type: 0
-    Key: Textures
-    SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
-    LargeIcon: {fileID: 2800000, guid: f61940b61bdca1843bed2dbc93de9038, type: 3}
+    Key: Fonts
+    SmallIcon: {fileID: 2800000, guid: 163b4b589845fee47ac105cdfb911b77, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 87a78956e37a460439f1871712ce87fc, type: 3}
   - Type: 0
     Key: Icons
     SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
@@ -49,29 +45,37 @@ MonoBehaviour:
     SmallIcon: {fileID: 2800000, guid: 0508340b76cfbdd43826ca620f578abd, type: 3}
     LargeIcon: {fileID: 2800000, guid: a4decc2460e61e44b9ccd3d2d248738b, type: 3}
   - Type: 0
-    Key: Audio
-    SmallIcon: {fileID: 2800000, guid: 4372cfb8a7d3b5b4d9b899147b193270, type: 3}
-    LargeIcon: {fileID: 2800000, guid: 65e13c9890ffa26478506eda78683d5c, type: 3}
+    Key: Meshes
+    SmallIcon: {fileID: 2800000, guid: 268edea26d8cd504da659cc71a1d8549, type: 3}
+    LargeIcon: {fileID: 2800000, guid: e69e4447e8078c441b3a955855f4f080, type: 3}
+  - Type: 0
+    Key: Plugins
+    SmallIcon: {fileID: 2800000, guid: 8f45cff1df9688244b1fa6e2da91e05f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 15c3471930a7ff44aa9a30bc21a5ea06, type: 3}
+  - Type: 0
+    Key: Prefabs
+    SmallIcon: {fileID: 2800000, guid: 483d693b3f9d5704b89409016b40bc74, type: 3}
+    LargeIcon: {fileID: 2800000, guid: fac7470563f79024ebc244b39080448d, type: 3}
   - Type: 0
     Key: Project
     SmallIcon: {fileID: 2800000, guid: 36e0a02c0316e0b40bd7ffc8eb437a7f, type: 3}
     LargeIcon: {fileID: 2800000, guid: ce20e3678b7748244854c06fcd7d7d00, type: 3}
   - Type: 0
-    Key: Fonts
-    SmallIcon: {fileID: 2800000, guid: 163b4b589845fee47ac105cdfb911b77, type: 3}
-    LargeIcon: {fileID: 2800000, guid: 87a78956e37a460439f1871712ce87fc, type: 3}
-  - Type: 0
-    Key: Editor
-    SmallIcon: {fileID: 2800000, guid: ec2951dbd8c22234c8fdf92529d860fd, type: 3}
-    LargeIcon: {fileID: 2800000, guid: ad4412933c34d994a9a6daafb8202f4a, type: 3}
+    Key: RainbowFolders
+    SmallIcon: {fileID: 2800000, guid: 8d50cf779e5b4f54a831bdefc32b044c, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 5c32cf9ad519d0c4aacb16805c45eab3, type: 3}
   - Type: 0
     Key: Resources
     SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
     LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
   - Type: 0
-    Key: Data
-    SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
-    LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
+    Key: Scenes
+    SmallIcon: {fileID: 2800000, guid: 40ff06f7c381dcf4391ca8342d04260c, type: 3}
+    LargeIcon: {fileID: 2800000, guid: f9d86cd8e960f584a9aa5a8ee61c4115, type: 3}
+  - Type: 0
+    Key: Scripts
+    SmallIcon: {fileID: 2800000, guid: ed89c5b2588683046989a2a138f3b343, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 9fca1a811da70484494d9e10d46e0636, type: 3}
   - Type: 0
     Key: Shaders
     SmallIcon: {fileID: 2800000, guid: 015a543b4163bfa498964b0db1004815, type: 3}
@@ -81,10 +85,26 @@ MonoBehaviour:
     SmallIcon: {fileID: 2800000, guid: c75be7d9cde129149bb04f51d452d85a, type: 3}
     LargeIcon: {fileID: 2800000, guid: 4716b9cfe49343c499142d04bb004e0b, type: 3}
   - Type: 0
-    Key: Meshes
-    SmallIcon: {fileID: 2800000, guid: 268edea26d8cd504da659cc71a1d8549, type: 3}
-    LargeIcon: {fileID: 2800000, guid: e69e4447e8078c441b3a955855f4f080, type: 3}
+    Key: Textures
+    SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
+    LargeIcon: {fileID: 2800000, guid: f61940b61bdca1843bed2dbc93de9038, type: 3}
   - Type: 0
-    Key: RainbowFolders
-    SmallIcon: {fileID: 2800000, guid: 8d50cf779e5b4f54a831bdefc32b044c, type: 3}
-    LargeIcon: {fileID: 2800000, guid: 5c32cf9ad519d0c4aacb16805c45eab3, type: 3}
+    Key: Android
+    SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
+    LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
+  - Type: 0
+    Key: iOS
+    SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
+  - Type: 0
+    Key: Windows
+    SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}
+  - Type: 0
+    Key: Mac
+    SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
+  - Type: 0
+    Key: WebGL
+    SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}
diff --git a/Assets/RainbowFolders/Editor/Icons/Types/Platforms.meta b/Assets/RainbowFolders/Editor/Icons/Types/Platforms.meta
diff --git a/Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_16.png b/Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_16.png
diff --git a/Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_16.png.meta b/Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_16.png.meta
diff --git a/Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_64.png b/Assets/RainbowFolders/Editor/Icons/Types/Platforms/android_icon_64.png