Merged develop into master

Borod4r · Dec 1, 2016 · 3a49f45 · 3a49f45
2 parents c5d23c0 + 5024e81
commit 3a49f45
Show file tree

Hide file tree

Showing 34 changed files with 785 additions and 122 deletions.
diff --git a/Assets/Editor Default Resources/RainbowFolders.meta b/Assets/Editor Default Resources/RainbowFolders.meta
diff --git a/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset b/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset
@@ -0,0 +1,62 @@
+%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: 61ce4e6f0e8de4b869c42bc50400d057, type: 3}
+  m_Name: RainbowTypeFoldersIconsStorage
+  m_EditorClassIdentifier: 
+  TypeFolderIcons:
+  - Type: 0
+    SmallIcon: {fileID: 2800000, guid: 483d693b3f9d5704b89409016b40bc74, type: 3}
+    LargeIcon: {fileID: 2800000, guid: fac7470563f79024ebc244b39080448d, type: 3}
+  - Type: 1
+    SmallIcon: {fileID: 2800000, guid: 40ff06f7c381dcf4391ca8342d04260c, type: 3}
+    LargeIcon: {fileID: 2800000, guid: f9d86cd8e960f584a9aa5a8ee61c4115, type: 3}
+  - Type: 2
+    SmallIcon: {fileID: 2800000, guid: ed89c5b2588683046989a2a138f3b343, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 9fca1a811da70484494d9e10d46e0636, type: 3}
+  - Type: 3
+    SmallIcon: {fileID: 2800000, guid: 0a498e8f7fbcbef4db91d2d411e3f70f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: b88339035f924f94eab1e64bac79149f, type: 3}
+  - Type: 4
+    SmallIcon: {fileID: 2800000, guid: 8f45cff1df9688244b1fa6e2da91e05f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 15c3471930a7ff44aa9a30bc21a5ea06, type: 3}
+  - Type: 5
+    SmallIcon: {fileID: 2800000, guid: 27bb0c12d809b1e4fb2851723d50cde6, type: 3}
+    LargeIcon: {fileID: 2800000, guid: f61940b61bdca1843bed2dbc93de9038, type: 3}
+  - Type: 6
+    SmallIcon: {fileID: 2800000, guid: 0508340b76cfbdd43826ca620f578abd, type: 3}
+    LargeIcon: {fileID: 2800000, guid: a4decc2460e61e44b9ccd3d2d248738b, type: 3}
+  - Type: 7
+    SmallIcon: {fileID: 2800000, guid: 4372cfb8a7d3b5b4d9b899147b193270, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 65e13c9890ffa26478506eda78683d5c, type: 3}
+  - Type: 8
+    SmallIcon: {fileID: 2800000, guid: 36e0a02c0316e0b40bd7ffc8eb437a7f, type: 3}
+    LargeIcon: {fileID: 2800000, guid: ce20e3678b7748244854c06fcd7d7d00, type: 3}
+  - Type: 9
+    SmallIcon: {fileID: 2800000, guid: 163b4b589845fee47ac105cdfb911b77, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 87a78956e37a460439f1871712ce87fc, type: 3}
+  - Type: 10
+    SmallIcon: {fileID: 2800000, guid: ec2951dbd8c22234c8fdf92529d860fd, type: 3}
+    LargeIcon: {fileID: 2800000, guid: ad4412933c34d994a9a6daafb8202f4a, type: 3}
+  - Type: 11
+    SmallIcon: {fileID: 2800000, guid: 97efd597cd18c564aadb45280476b23a, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 650a564eae901434e86dcb456fcc046a, type: 3}
+  - Type: 12
+    SmallIcon: {fileID: 2800000, guid: 015a543b4163bfa498964b0db1004815, type: 3}
+    LargeIcon: {fileID: 2800000, guid: fe053ca6ee802d5478277554f1b356d5, type: 3}
+  - Type: 13
+    SmallIcon: {fileID: 2800000, guid: c75be7d9cde129149bb04f51d452d85a, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 4716b9cfe49343c499142d04bb004e0b, type: 3}
+  - Type: 14
+    SmallIcon: {fileID: 2800000, guid: 268edea26d8cd504da659cc71a1d8549, type: 3}
+    LargeIcon: {fileID: 2800000, guid: e69e4447e8078c441b3a955855f4f080, type: 3}
+  - Type: 15
+    SmallIcon: {fileID: 2800000, guid: 8d50cf779e5b4f54a831bdefc32b044c, type: 3}
+    LargeIcon: {fileID: 2800000, guid: 5c32cf9ad519d0c4aacb16805c45eab3, type: 3}
diff --git a/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset.meta b/Assets/Editor Default Resources/RainbowFolders/RainbowTypeFoldersIconsStorage.asset.meta
diff --git a/Assets/RainbowFolders/Editor.meta b/Assets/RainbowFolders/Editor.meta
diff --git a/Assets/RainbowFolders/Editor/Menu.meta b/Assets/RainbowFolders/Editor/Menu.meta
diff --git a/Assets/RainbowFolders/Editor/Menu/Colors.meta b/Assets/RainbowFolders/Editor/Menu/Colors.meta
diff --git a/Assets/RainbowFolders/Editor/Menu/Colors/FolderColors.cs b/Assets/RainbowFolders/Editor/Menu/Colors/FolderColors.cs
@@ -17,8 +17,6 @@ namespace Borodar.RainbowFolders.Editor
 {
     public enum FolderColors
     {
-        Default = -1,
-
         Red = 0,
         Vermilion = 1,
         Orange = 2,