diff --git a/Codebase/@Solutions~/5.4/UnityEditor.dll b/Codebase/@Solutions~/5.4/UnityEditor.dll index 30b78c742..f95fd6135 100644 Binary files a/Codebase/@Solutions~/5.4/UnityEditor.dll and b/Codebase/@Solutions~/5.4/UnityEditor.dll differ diff --git a/Codebase/@Solutions~/5.4/UnityEngine.dll b/Codebase/@Solutions~/5.4/UnityEngine.dll index 1284cd690..62d324e32 100644 Binary files a/Codebase/@Solutions~/5.4/UnityEngine.dll and b/Codebase/@Solutions~/5.4/UnityEngine.dll differ diff --git a/Codebase/@Solutions~/5.5/UnityEditor.dll b/Codebase/@Solutions~/5.5/UnityEditor.dll new file mode 100644 index 000000000..8045940fc Binary files /dev/null and b/Codebase/@Solutions~/5.5/UnityEditor.dll differ diff --git a/Codebase/@Solutions~/5.5/UnityEngine.dll b/Codebase/@Solutions~/5.5/UnityEngine.dll new file mode 100644 index 000000000..80cf67e50 Binary files /dev/null and b/Codebase/@Solutions~/5.5/UnityEngine.dll differ diff --git a/Codebase/@Solutions~/Compile Themes 4.7.2.bat b/Codebase/@Solutions~/Compile Themes 4.7.2.bat index 168e1f760..acfd1ab85 100644 --- a/Codebase/@Solutions~/Compile Themes 4.7.2.bat +++ b/Codebase/@Solutions~/Compile Themes 4.7.2.bat @@ -1,27 +1,37 @@ -@ECHO OFF -copy /Y 4.7.2\* . >NUL -del ZiosThemes*.dll -IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32 -IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64 -IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32 -IF EXIST "%programfiles(x86)%\MSBuild\15.0\Bin" GOTO USE_VS15_X64 -GOTO CLOSE -:USE_VS14_X32 - echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 32-bit host)... - "%programfiles%\MSBuild\14.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:USE_VS14_X64 - echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 64-bit host)... - "%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:USE_VS15_X32 - echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 32-bit host)... - "%programfiles%\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:USE_VS15_X64 - echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 64-bit host)... - "%programfiles(x86)%\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:CLOSE -copy /Y 5.4\* . >NUL +@ECHO OFF +copy /Y 4.7.2\* . >NUL +del ZiosThemes*.dll +IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32 +IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64 +IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32 +IF EXIST "%programfiles(x86)%\MSBuild\15.0\Bin" GOTO USE_VS15_X64 +IF EXIST "%programfiles%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" GOTO USE_VS2017_X32 +IF EXIST "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" GOTO USE_VS2017_X64 +GOTO CLOSE +:USE_VS14_X32 + echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 32-bit host)... + "%programfiles%\MSBuild\14.0\Bin\MSBuild.exe" ZiosThemes.sln + GOTO CLOSE +:USE_VS14_X64 + echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 64-bit host)... + "%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" ZiosThemes.sln + GOTO CLOSE +:USE_VS15_X32 + echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 32-bit host)... + "%programfiles%\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln + GOTO CLOSE +:USE_VS15_X64 + echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 64-bit host)... + "%programfiles(x86)%\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln + GOTO CLOSE +:USE_VS2017_X32 + echo Compiling ZiosThemes.dll - Visual Studio 2017 / MSBuild 15 (on 32-bit host)... + "%programfiles%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln + GOTO CLOSE +:USE_VS2017_X64 + echo Compiling ZiosThemes.dll - Visual Studio 2017 / MSBuild 15 (on 64-bit host)... + "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln + GOTO CLOSE +:CLOSE +copy /Y 4.7.2\* . >NUL rmdir /Q /S obj \ No newline at end of file diff --git a/Codebase/@Solutions~/Compile Themes 5.4.bat b/Codebase/@Solutions~/Compile Themes 5.4.bat index b22469a96..737efbc78 100644 --- a/Codebase/@Solutions~/Compile Themes 5.4.bat +++ b/Codebase/@Solutions~/Compile Themes 5.4.bat @@ -1,27 +1,37 @@ -@ECHO OFF -copy /Y 5.4\* . >NUL -del ZiosThemes*.dll -IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32 -IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64 -IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32 -IF EXIST "%programfiles(x86)%\MSBuild\15.0\Bin" GOTO USE_VS15_X64 -GOTO CLOSE -:USE_VS14_X32 - echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 32-bit host)... - "%programfiles%\MSBuild\14.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:USE_VS14_X64 - echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 64-bit host)... - "%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:USE_VS15_X32 - echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 32-bit host)... - "%programfiles%\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:USE_VS15_X64 - echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 64-bit host)... - "%programfiles(x86)%\MSBuild\15.0\Bin\MSBuild.exe" ZiosThemes.sln - GOTO CLOSE -:CLOSE -copy /Y 5.4\* . >NUL +@ECHO OFF +copy /Y 5.4\* . >NUL +del ZiosThemes*.dll +IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32 +IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64 +IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32 +IF EXIST "%programfiles(x86)%\MSBuild\15.0\Bin" GOTO USE_VS15_X64 +IF EXIST "%programfiles%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" GOTO USE_VS2017_X32 +IF EXIST "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" GOTO USE_VS2017_X64 +GOTO CLOSE +:USE_VS14_X32 + echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 32-bit host)... + "%programfiles%\MSBuild\14.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS14_X64 + echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 64-bit host)... + "%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS15_X32 + echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 32-bit host)... + "%programfiles%\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS15_X64 + echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 64-bit host)... + "%programfiles(x86)%\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS2017_X32 + echo Compiling ZiosThemes.dll - Visual Studio 2017 / MSBuild 15 (on 32-bit host)... + "%programfiles%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS2017_X64 + echo Compiling ZiosThemes.dll - Visual Studio 2017 / MSBuild 15 (on 64-bit host)... + "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:CLOSE +copy /Y 5.4\* . >NUL rmdir /Q /S obj \ No newline at end of file diff --git a/Codebase/@Solutions~/Compile Themes 5.5.bat b/Codebase/@Solutions~/Compile Themes 5.5.bat new file mode 100644 index 000000000..422792eaa --- /dev/null +++ b/Codebase/@Solutions~/Compile Themes 5.5.bat @@ -0,0 +1,37 @@ +@ECHO OFF +copy /Y 5.5\* . >NUL +del ZiosThemes*.dll +IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32 +IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64 +IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32 +IF EXIST "%programfiles(x86)%\MSBuild\15.0\Bin" GOTO USE_VS15_X64 +IF EXIST "%programfiles%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" GOTO USE_VS2017_X32 +IF EXIST "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" GOTO USE_VS2017_X64 +GOTO CLOSE +:USE_VS14_X32 + echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 32-bit host)... + "%programfiles%\MSBuild\14.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES;UNITY_5_5;UNITY_5_5_OR_NEWER" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS14_X64 + echo Compiling ZiosThemes.dll - Visual Studio 2015 / MSBuild 2015 (on 64-bit host)... + "%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES;UNITY_5_5;UNITY_5_5_OR_NEWER" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS15_X32 + echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 32-bit host)... + "%programfiles%\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES;UNITY_5_5;UNITY_5_5_OR_NEWER" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS15_X64 + echo Compiling ZiosThemes.dll - Visual Studio 15 / MSBuild 15 (on 64-bit host)... + "%programfiles(x86)%\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES;UNITY_5_5;UNITY_5_5_OR_NEWER" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS2017_X32 + echo Compiling ZiosThemes.dll - Visual Studio 2017 / MSBuild 15 (on 32-bit host)... + "%programfiles%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES;UNITY_5_5;UNITY_5_5_OR_NEWER" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:USE_VS2017_X64 + echo Compiling ZiosThemes.dll - Visual Studio 2017 / MSBuild 15 (on 64-bit host)... + "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" /p:DefineConstants="UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES;UNITY_5_5;UNITY_5_5_OR_NEWER" /t:Rebuild ZiosThemes.sln + GOTO CLOSE +:CLOSE +copy /Y 5.5\* . >NUL +rmdir /Q /S obj \ No newline at end of file diff --git a/Codebase/@Solutions~/UnityEditor.dll b/Codebase/@Solutions~/UnityEditor.dll index 30b78c742..8045940fc 100644 Binary files a/Codebase/@Solutions~/UnityEditor.dll and b/Codebase/@Solutions~/UnityEditor.dll differ diff --git a/Codebase/@Solutions~/UnityEngine.dll b/Codebase/@Solutions~/UnityEngine.dll index 1284cd690..80cf67e50 100644 Binary files a/Codebase/@Solutions~/UnityEngine.dll and b/Codebase/@Solutions~/UnityEngine.dll differ diff --git a/Codebase/@Solutions~/ZiosThemes.csproj b/Codebase/@Solutions~/ZiosThemes.csproj index 1dbdcf790..17905a5d2 100644 --- a/Codebase/@Solutions~/ZiosThemes.csproj +++ b/Codebase/@Solutions~/ZiosThemes.csproj @@ -1,108 +1,108 @@ - - - - - Release - AnyCPU - {90C40447-C2B4-4725-9CEA-9E0E8199EEFC} - Library - Properties - ZiosThemes - ZiosThemes - v3.5 - 512 - - - true - . - prompt - 4 - UNITY_5;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES - - - - - - UnityEngine.dll - - - UnityEditor.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Release + AnyCPU + {90C40447-C2B4-4725-9CEA-9E0E8199EEFC} + Library + Properties + ZiosThemes + ZiosThemes + v3.5 + 512 + + + true + . + prompt + 4 + UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_THEMES + + + + + + UnityEngine.dll + + + UnityEditor.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Codebase/@Solutions~/ZiosThemes.sln b/Codebase/@Solutions~/ZiosThemes.sln index dd6606439..f2d7bdbfd 100644 --- a/Codebase/@Solutions~/ZiosThemes.sln +++ b/Codebase/@Solutions~/ZiosThemes.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25123.0 diff --git a/Codebase/Containers.meta b/Codebase/Containers.meta index 95bfba4e2..b3a6d7e68 100644 --- a/Codebase/Containers.meta +++ b/Codebase/Containers.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 216f5177bfc82db4d91d4632f7e449e9 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Editor.meta b/Codebase/Editor.meta index 79fc68c61..05073cd54 100644 --- a/Codebase/Editor.meta +++ b/Codebase/Editor.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 81f5d2130d0a2ca49aaa496314d7fc2d folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Extensions.meta b/Codebase/Extensions.meta index 0e3157773..b1358d1c5 100644 --- a/Codebase/Extensions.meta +++ b/Codebase/Extensions.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 7391bd3d2e8718d48a7a599b70b5d248 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity.meta b/Codebase/Extensions/@Unity.meta index 24f13d968..b89c615c1 100644 --- a/Codebase/Extensions/@Unity.meta +++ b/Codebase/Extensions/@Unity.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1438934640 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/Editor.meta b/Codebase/Extensions/@Unity/Editor.meta index faeaeed3a..c15b521c1 100644 --- a/Codebase/Extensions/@Unity/Editor.meta +++ b/Codebase/Extensions/@Unity/Editor.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 39592d4aaf6002b4c800265c841189d6 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/EditorGUI.cs.meta b/Codebase/Extensions/@Unity/EditorGUI.cs.meta index ef6464981..f804a4654 100644 --- a/Codebase/Extensions/@Unity/EditorGUI.cs.meta +++ b/Codebase/Extensions/@Unity/EditorGUI.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/EditorGUILayout.cs b/Codebase/Extensions/@Unity/EditorGUILayout.cs index c325b1b0b..90745915c 100644 --- a/Codebase/Extensions/@Unity/EditorGUILayout.cs +++ b/Codebase/Extensions/@Unity/EditorGUILayout.cs @@ -28,7 +28,6 @@ public static void SetLayout(float width=0,float height=0,float maxWidth=0,float } public static GUILayoutOption[] CreateLayout(){ var options = new List(); - var style = new GUIStyle(); if(GUIStyleExtension.autoLayout){ if(EditorGUILayoutExtension.width != 0){options.Add(GUILayout.Width(EditorGUILayoutExtension.width));} if(EditorGUILayoutExtension.height != 0){options.Add(GUILayout.Height(EditorGUILayoutExtension.height));} diff --git a/Codebase/Extensions/@Unity/GUIContent.cs.meta b/Codebase/Extensions/@Unity/GUIContent.cs.meta index b00bbe5e7..3d505859b 100644 --- a/Codebase/Extensions/@Unity/GUIContent.cs.meta +++ b/Codebase/Extensions/@Unity/GUIContent.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/GUISkin.cs.meta b/Codebase/Extensions/@Unity/GUISkin.cs.meta index 7d2714302..1afebdb25 100644 --- a/Codebase/Extensions/@Unity/GUISkin.cs.meta +++ b/Codebase/Extensions/@Unity/GUISkin.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/GUIStyleState.cs b/Codebase/Extensions/@Unity/GUIStyleState.cs index 2b8331c80..39470e47f 100644 --- a/Codebase/Extensions/@Unity/GUIStyleState.cs +++ b/Codebase/Extensions/@Unity/GUIStyleState.cs @@ -2,7 +2,7 @@ namespace Zios{ public static class GUIStyleStateExtension{ public static GUIStyleState InvertTextColor(this GUIStyleState current,float intensityCompare,float difference=0.6f){ - var comparison = Mathf.Abs(intensityCompare - current.textColor.GetIntensity()); + var comparison = Mathf.Abs(intensityCompare - current.textColor.GetIntensity()); if(comparison < difference){ current.textColor = current.textColor.Invert(); } diff --git a/Codebase/Extensions/@Unity/GUIStyleState.cs.meta b/Codebase/Extensions/@Unity/GUIStyleState.cs.meta index a11ec0507..f39bd46c5 100644 --- a/Codebase/Extensions/@Unity/GUIStyleState.cs.meta +++ b/Codebase/Extensions/@Unity/GUIStyleState.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/Texture.cs.meta b/Codebase/Extensions/@Unity/Texture.cs.meta index 8353b77a9..05c626322 100644 --- a/Codebase/Extensions/@Unity/Texture.cs.meta +++ b/Codebase/Extensions/@Unity/Texture.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/@Unity/Vector4.cs.meta b/Codebase/Extensions/@Unity/Vector4.cs.meta index 7ab574d3a..259f7c917 100644 --- a/Codebase/Extensions/@Unity/Vector4.cs.meta +++ b/Codebase/Extensions/@Unity/Vector4.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/Object.meta b/Codebase/Extensions/Object.meta index cea82242d..97b8f2677 100644 --- a/Codebase/Extensions/Object.meta +++ b/Codebase/Extensions/Object.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1456459850 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/Object/ObjectReflection.cs.meta b/Codebase/Extensions/Object/ObjectReflection.cs.meta index 7c37392d1..8aed9aa2f 100644 --- a/Codebase/Extensions/Object/ObjectReflection.cs.meta +++ b/Codebase/Extensions/Object/ObjectReflection.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/SortedList.cs.meta b/Codebase/Extensions/SortedList.cs.meta index cdfe032ee..a462e1e45 100644 --- a/Codebase/Extensions/SortedList.cs.meta +++ b/Codebase/Extensions/SortedList.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Extensions/String.meta b/Codebase/Extensions/String.meta index 7e64d4eb9..bd7268a6f 100644 --- a/Codebase/Extensions/String.meta +++ b/Codebase/Extensions/String.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1456459850 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Supports.meta b/Codebase/Supports.meta index 92d20d5e8..b874b8360 100644 --- a/Codebase/Supports.meta +++ b/Codebase/Supports.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 771aef23c95ec3042a376ac9e8fb5657 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Supports/Utility.meta b/Codebase/Supports/Utility.meta index a0e5bb9d9..bf19dab60 100644 --- a/Codebase/Supports/Utility.meta +++ b/Codebase/Supports/Utility.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1456089715 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Supports/Utility/Utility.cs b/Codebase/Supports/Utility/Utility.cs index c15cc71c6..22e898219 100644 --- a/Codebase/Supports/Utility/Utility.cs +++ b/Codebase/Supports/Utility/Utility.cs @@ -114,7 +114,7 @@ public static void CallEditorPref(string name,bool showWarnings=false){ foreach(var method in callbacks.Split("|")){ if(called.Contains(method) || method.IsEmpty()){continue;} if(!method.CallMethod().IsNull()){ - success.Add(method); + success.Add(method); } called.Add(method); } diff --git a/Codebase/Supports/Utility/UtilityEditor.cs.meta b/Codebase/Supports/Utility/UtilityEditor.cs.meta index 289009d80..c9f5a5cc6 100644 --- a/Codebase/Supports/Utility/UtilityEditor.cs.meta +++ b/Codebase/Supports/Utility/UtilityEditor.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Supports/Utility/UtilityProxy.cs b/Codebase/Supports/Utility/UtilityProxy.cs index a763ec0e0..14bf08d2a 100644 --- a/Codebase/Supports/Utility/UtilityProxy.cs +++ b/Codebase/Supports/Utility/UtilityProxy.cs @@ -182,6 +182,7 @@ public static void RebuildInspectors(){ Type inspectorType = Utility.GetUnityType("InspectorWindow"); var windows = inspectorType.CallMethod("GetAllInspectorWindows"); for(int index=0;index("GetTracker"); tracker.ForceRebuild(); } diff --git a/Codebase/Supports/Utility/UtilityProxy.cs.meta b/Codebase/Supports/Utility/UtilityProxy.cs.meta index a2f62a514..22ea2ef28 100644 --- a/Codebase/Supports/Utility/UtilityProxy.cs.meta +++ b/Codebase/Supports/Utility/UtilityProxy.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/System Attributes.meta b/Codebase/System Attributes.meta index 257199828..c917500aa 100644 --- a/Codebase/System Attributes.meta +++ b/Codebase/System Attributes.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: dfddccac8fe649947a2f3c2c34119ec5 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/System Attributes/NotSerialized.cs.meta b/Codebase/System Attributes/NotSerialized.cs.meta index 36e559e44..e847ade3b 100644 --- a/Codebase/System Attributes/NotSerialized.cs.meta +++ b/Codebase/System Attributes/NotSerialized.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/System Attributes/Unity.meta b/Codebase/System Attributes/Unity.meta index ccfb3eef3..94e4da193 100644 --- a/Codebase/System Attributes/Unity.meta +++ b/Codebase/System Attributes/Unity.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1453946459 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems.meta b/Codebase/Systems.meta index 59ad083f2..959c44eec 100644 --- a/Codebase/Systems.meta +++ b/Codebase/Systems.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 5cb1250e37e8d3b409591c4ec5467192 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Systems/Event.meta b/Codebase/Systems/Event.meta index afd1f8f5c..e081252e8 100644 --- a/Codebase/Systems/Event.meta +++ b/Codebase/Systems/Event.meta @@ -2,4 +2,4 @@ fileFormatVersion: 2 guid: 4c4c06d6d2d69f34e88340e3fcdf4291 folderAsset: yes DefaultImporter: - userData: + userData: \ No newline at end of file diff --git a/Codebase/Systems/Event/EventDetector.cs.meta b/Codebase/Systems/Event/EventDetector.cs.meta index 404d3f09f..c54e4d7a4 100644 --- a/Codebase/Systems/Event/EventDetector.cs.meta +++ b/Codebase/Systems/Event/EventDetector.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: -50 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/File.meta b/Codebase/Systems/File.meta index 31ae094bb..2dcf2c9ac 100644 --- a/Codebase/Systems/File.meta +++ b/Codebase/Systems/File.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1464879955 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/File/FileManager.cs b/Codebase/Systems/File/FileManager.cs index 576926487..532e7853b 100644 --- a/Codebase/Systems/File/FileManager.cs +++ b/Codebase/Systems/File/FileManager.cs @@ -14,6 +14,7 @@ namespace Zios{ public static class FileManager{ private static string path; private static string dataPath; + public static bool monitor = true; private static bool debug = false; private static bool clock = false; private static bool fullScan = true; @@ -30,6 +31,7 @@ static FileManager(){ FileManager.Refresh(); } public static void Monitor(){ + if(!FileManager.monitor){return;} var time = FileManager.GetTime(); if(time>FileManager.lastMonitor){ foreach(var item in FileManager.monitors){ diff --git a/Codebase/Systems/Interface.meta b/Codebase/Systems/Interface.meta index e4d80ac13..463bcba6d 100644 --- a/Codebase/Systems/Interface.meta +++ b/Codebase/Systems/Interface.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1441084692 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Style.meta b/Codebase/Systems/Interface/Style.meta index ee65f88ce..cd48c8dcc 100644 --- a/Codebase/Systems/Interface/Style.meta +++ b/Codebase/Systems/Interface/Style.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1441084692 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Style/StyleCSS.cs.meta b/Codebase/Systems/Interface/Style/StyleCSS.cs.meta index 281f77d5a..b22180870 100644 --- a/Codebase/Systems/Interface/Style/StyleCSS.cs.meta +++ b/Codebase/Systems/Interface/Style/StyleCSS.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes.meta b/Codebase/Systems/Interface/Themes.meta index 6bad90678..c6e7de8f3 100644 --- a/Codebase/Systems/Interface/Themes.meta +++ b/Codebase/Systems/Interface/Themes.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1458329290 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor.meta b/Codebase/Systems/Interface/Themes/Editor.meta index 0ece68d50..532ff5125 100644 --- a/Codebase/Systems/Interface/Themes/Editor.meta +++ b/Codebase/Systems/Interface/Themes/Editor.meta @@ -4,6 +4,6 @@ folderAsset: yes timeCreated: 1457889581 licenseType: Free DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs b/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs index 19eb838fe..3a012ea24 100644 --- a/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs +++ b/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs @@ -45,7 +45,7 @@ public static void UpdateSystem(){ key = key ?? Registry.GetValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Accent","AccentColor",null); if(!key.IsNull()){ int value = key.As(); - system.value = value != -1 ? value.ToHex().ToColor(true) : RelativeColor.system.value; + system.value = value != -1 ? value.ToHex().ToColor(true) : RelativeColor.system.value; } else{ key = Registry.GetValue("HKEY_LOCAL_MACHINE\\Software\\Policies\\Microsoft\\Windows\\Personalization","PersonalColor_Accent",null); @@ -69,7 +69,7 @@ public string Serialize(int nameLength=0,int sourceNameLength=0){ var name = nameLength < 1 ? this.name : this.name.PadRight(nameLength,' '); var contents = name + " : " + this.value.Serialize().PadRight(9,' '); if(!this.sourceName.IsEmpty()){ - var sourceName = sourceNameLength < 1 ? this.sourceName : this.sourceName.PadRight(sourceNameLength,' '); + var sourceName = sourceNameLength < 1 ? this.sourceName : this.sourceName.PadRight(sourceNameLength,' '); contents += " : " + sourceName; } if(this.offset != 1){contents += " : " + this.offset;} @@ -160,4 +160,4 @@ public Texture2D UpdateTexture(string path){ return image; } } -} +} \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs.meta b/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs.meta index b5fa87a94..7bd467e7d 100644 --- a/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/RelativeColor.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/Theme.cs.meta b/Codebase/Systems/Interface/Themes/Editor/Theme.cs.meta index d0dcb137e..275c7b422 100644 --- a/Codebase/Systems/Interface/Themes/Editor/Theme.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/Theme.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs b/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs index 1c46de74d..4dfb35c6f 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs @@ -78,7 +78,7 @@ public void Deserialize(string data){ var value = current.Parse("=").Trim(); if(term.Matches("Font",true)){ themeFont.font = FileManager.GetAsset(value+".ttf",false); - themeFont.font = themeFont.font ?? FileManager.GetAsset(value+".otf",false); + themeFont.font = themeFont.font ?? FileManager.GetAsset(value+".otf",false); themeFont.font = themeFont.font ?? Resources.FindObjectsOfTypeAll().Where(x=>x.name==value).FirstOrDefault(); } else if(term.Matches("SizeOffset",true)){themeFont.sizeOffset = value.ToInt();} @@ -151,4 +151,4 @@ public ThemeFont(string name,int sizeOffset=0,float offsetX=0,float offsetY=0){ this.offsetY = offsetY; } } -} +} \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs.meta index cadd6e864..b2e62bb0d 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeFontset.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs b/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs index fbd923256..69d08be26 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs @@ -143,7 +143,6 @@ public string Serialize(bool original=false){ if(!value.tooltip.IsEmpty()){contents = contents.AddLine("tooltip = "+target.tooltip);} return contents; } - public void Setup(string path){ if(this.imageName.IsEmpty()){return;} this.value.image = FileManager.GetAsset(path+"/"+this.imageName+".png"); @@ -193,4 +192,4 @@ public static void Dump(Theme theme){ } } } -} +} \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs.meta index 3f05e6c42..22a9bb00b 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeIconset.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs b/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs index 3793d8efe..782927b96 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs +++ b/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs @@ -205,7 +205,10 @@ public void ApplyTexture(string path,Texture2D texture){ } name = isSplat ? parts.Skip(3).Join("-") : parts.Join("-"); var original = FileManager.Find(path.GetDirectory().GetDirectory()+"/"+name); - if(original.IsNull()){return;} + if(original.IsNull()){ + Debug.Log("[ThemePallete] : Unable to find original asset for dynamic texture -- " + name); + return; + } int index = 0; var pixels = texture.GetPixels(); foreach(var pixel in pixels.Copy()){ @@ -236,4 +239,4 @@ public void ApplyTexture(string path,Texture2D texture){ originalImage.Apply(); } } -} +} \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs.meta index 61be6ab99..094f846dc 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemePalette.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeSaving.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeSaving.cs.meta index 6601ef8c6..c24fd9f2a 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeSaving.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeSaving.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs b/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs index ee033ae20..75526e104 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs @@ -154,4 +154,4 @@ public static void RemoveHover(GUISkin skin){ } } } -} +} \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs.meta index 841ec4dd6..a8425c9b3 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs b/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs index 4c9c11a2d..d08d0cb0e 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs @@ -12,13 +12,14 @@ public enum HoverResponse{None=1,Slow,Moderate,Instant}; [InitializeOnLoad][NotSerialized] public partial class Theme{ public static Theme active; - public static string revision = "4 [r519]"; + public static string revision = "4 [r522]"; public static int themeIndex; public static int paletteIndex; public static int fontsetIndex; public static int iconsetIndex; public static int skinsetIndex; public static string storagePath; + public static bool editMode; public static bool liveEdit; public static HoverResponse hoverResponse = HoverResponse.Moderate; public static bool separatePlaymodeSettings = false; @@ -54,8 +55,10 @@ public static void ShowWindow(){ Theme.window.ShowPopup(); } } - Theme.window.position = new Rect(9001,9001,1,1); - Theme.window.minSize = new Vector2(1,1); + var hiddenPosition = new Rect(9001,9001,1,1); + var hiddenSize = new Vector2(1,1); + if(Theme.window.position != hiddenPosition){Theme.window.position = hiddenPosition;} + if(Theme.window.minSize != hiddenSize){Theme.window.minSize = hiddenSize;} } public static void Update(){ if(EditorApplication.isCompiling || EditorApplication.isUpdating){return;} @@ -115,6 +118,7 @@ public static void LoadSettings(){ RelativeColor.autoBalance = EditorPrefs.GetInt("EditorTheme-AutobalanceColors",1).As(); Theme.showAdvanced = EditorPrefs.GetBool("EditorTheme-ShowAdvancedColors",false); Theme.hoverResponse = EditorPrefs.GetInt("EditorTheme-HoverResponse",3).As(); + Theme.editMode = FileManager.monitor = EditorPrefs.GetBool("EditorTheme-EditMode",false); Theme.separatePlaymodeSettings = EditorPrefs.GetBool("EditorTheme-SeparatePlaymodeSettings",false); Theme.suffix = EditorApplication.isPlayingOrWillChangePlaymode && Theme.separatePlaymodeSettings ? "-Playmode" : ""; Theme.themeIndex = Theme.all.FindIndex(x=>x.name==EditorPrefs.GetString("EditorTheme"+Theme.suffix,"Default")).Max(0); @@ -130,6 +134,7 @@ public static void LoadSettings(){ public static void RebuildStyles(){ var terms = new string[]{"Styles","styles","s_GOStyles","s_Current","s_Styles","m_Styles","ms_Styles","constants","s_Defaults"}; foreach(var type in typeof(Editor).Assembly.GetTypes()){ + if(type.Name.Contains("LookDev")){continue;} foreach(var term in terms){ type.ClearVariable(term,ObjectExtension.staticFlags); } @@ -318,6 +323,12 @@ public static void DrawOptions(){ Theme.Reset(true); return; } + Theme.editMode = FileManager.monitor = Theme.editMode.Draw("Edit Mode"); + if(EditorGUIExtension.lastChanged && Application.isPlaying){ + EditorPrefs.SetBool("EditorTheme-SeparatePlaymodeSettings",Theme.separatePlaymodeSettings); + Theme.Reset(true); + return; + } foreach(var variant in theme.skinset.variants){ variant.active = variant.active.Draw(variant.name); if(EditorGUIExtension.lastChanged){ @@ -328,6 +339,7 @@ public static void DrawOptions(){ Theme.window.wantsMouseMove = Theme.hoverResponse != HoverResponse.None; EditorPrefs.SetInt("EditorTheme-HoverResponse",Theme.hoverResponse.ToInt()); EditorPrefs.SetBool("EditorTheme-SeparatePlaymodeSettings",Theme.separatePlaymodeSettings); + EditorPrefs.SetBool("EditorTheme-EditMode",Theme.editMode); GUILayout.Space(2); EditorGUI.indentLevel -= 1; } @@ -602,6 +614,7 @@ public static void DebugRefresh(){ Debug.LogError("[Themes] Example Error message."); Debug.LogWarning("[Themes] Example Warning message."); Theme.setup = false; + Theme.loaded = false; Theme.disabled = false; } [MenuItem("Zios/Theme/Development/Toggle Live Edit")] @@ -691,9 +704,16 @@ public static void OnPostprocessAllAssets(string[] imported,string[] deleted,str } public void OnPreprocessTexture(){ TextureImporter importer = (TextureImporter)this.assetImporter; - if(importer.assetPath.ContainsAny("Themes")){ + if(importer.assetPath.Contains("Themes")){ importer.isReadable = true; + #if UNITY_5_5_OR_NEWER + importer.textureCompression = TextureImporterCompression.Uncompressed; + var settings = importer.GetDefaultPlatformTextureSettings(); + settings.overridden = true; + settings.format = TextureImporterFormat.RGBA32; + #else importer.textureFormat = TextureImporterFormat.RGBA32; + #endif if(importer.assetPath.Contains("Border")){ importer.filterMode = FilterMode.Point; } diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs.meta index 2928601e5..cb665600c 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeUtility.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeUtility.cs.meta index 09e46d059..0fc7ef061 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeUtility.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeUtility.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeVerticalSpace.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeVerticalSpace.cs.meta index 02857a412..3b616ed66 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeVerticalSpace.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeVerticalSpace.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Codebase/Systems/Interface/Themes/Editor/ThemeWindow.cs.meta b/Codebase/Systems/Interface/Themes/Editor/ThemeWindow.cs.meta index b03b42630..bc0e56027 100644 --- a/Codebase/Systems/Interface/Themes/Editor/ThemeWindow.cs.meta +++ b/Codebase/Systems/Interface/Themes/Editor/ThemeWindow.cs.meta @@ -7,6 +7,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Themes/Iconsets/Simplicity/Collab.png b/Themes/Iconsets/Simplicity/Collab.png new file mode 100644 index 000000000..1f7c08a52 Binary files /dev/null and b/Themes/Iconsets/Simplicity/Collab.png differ diff --git a/Themes/Iconsets/Simplicity/Collab.png.meta b/Themes/Iconsets/Simplicity/Collab.png.meta new file mode 100644 index 000000000..1f6228dcf --- /dev/null +++ b/Themes/Iconsets/Simplicity/Collab.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 89df9a0ae6085a74db60b1817a638e52 +timeCreated: 1483770790 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Themes/Iconsets/Simplicity/Dynamic/#Collab.png b/Themes/Iconsets/Simplicity/Dynamic/#Collab.png new file mode 100644 index 000000000..9cbf8a42d Binary files /dev/null and b/Themes/Iconsets/Simplicity/Dynamic/#Collab.png differ diff --git a/Themes/Iconsets/Simplicity/Dynamic/#Collab.png.meta b/Themes/Iconsets/Simplicity/Dynamic/#Collab.png.meta new file mode 100644 index 000000000..f8b9b3240 --- /dev/null +++ b/Themes/Iconsets/Simplicity/Dynamic/#Collab.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 1e733a5098bdd82409b4b0e513d12d41 +timeCreated: 1483770790 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Themes/Iconsets/Simplicity/Empty.png b/Themes/Iconsets/Simplicity/Empty.png new file mode 100644 index 000000000..a0e33db2a Binary files /dev/null and b/Themes/Iconsets/Simplicity/Empty.png differ diff --git a/Themes/Iconsets/Simplicity/Empty.png.meta b/Themes/Iconsets/Simplicity/Empty.png.meta new file mode 100644 index 000000000..313fe570b --- /dev/null +++ b/Themes/Iconsets/Simplicity/Empty.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 029c9f6ea93de5747ae65705d0f2f68e +timeCreated: 1483731392 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Themes/Iconsets/Simplicity/UnityEditor.Toolbar.s_CollabIcons.guicontent b/Themes/Iconsets/Simplicity/UnityEditor.Toolbar.s_CollabIcons.guicontent new file mode 100644 index 000000000..d359e6bca --- /dev/null +++ b/Themes/Iconsets/Simplicity/UnityEditor.Toolbar.s_CollabIcons.guicontent @@ -0,0 +1,45 @@ +(UnityEditor.Toolbar.s_CollabIcons) +[0] +text = Collab +image = Collab +tooltip = You need to enable collab. + +[1] +text = Collab +image = Collab +tooltip = You are up to date. + +[2] +text = Collab +image = Collab +tooltip = Please fix your conflicts prior to publishing. + +[3] +text = Collab +image = Collab +tooltip = Last operation failed. Please retry later. + +[4] +text = Collab +image = Collab +tooltip = Please update, there are server changes. + +[5] +text = Collab +image = Collab +tooltip = You have files to publish. + +[6] +text = Collab +image = Collab +tooltip = Operation in progress. + +[7] +text = Collab +image = Collab +tooltip = Collab is disabled. + +[8] +text = Collab +image = Collab +tooltip = Please check your network connection. \ No newline at end of file diff --git a/Themes/Iconsets/Simplicity/UnityEditor.Toolbar.s_CollabIcons.guicontent.meta b/Themes/Iconsets/Simplicity/UnityEditor.Toolbar.s_CollabIcons.guicontent.meta new file mode 100644 index 000000000..eb5819e21 --- /dev/null +++ b/Themes/Iconsets/Simplicity/UnityEditor.Toolbar.s_CollabIcons.guicontent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c0d77f5dfa088b48b14a678aedd0d09 +timeCreated: 1483731736 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Themes/Palettes/Basic/Loch.unitypalette b/Themes/Palettes/Basic/Loch.unitypalette new file mode 100644 index 000000000..8007b0334 --- /dev/null +++ b/Themes/Palettes/Basic/Loch.unitypalette @@ -0,0 +1,40 @@ +[Textured] +(Main) + Main : #263532 + MainActive : #00FFB5 + MainButton : #324E49 + MainIcons : #00FFB5 + Border : #1C1F21 + BorderActive : #245F4E + BorderButton : #00FFB520 + BorderIcons : #00FFB5B4 + Highlight : #245F4E + HighlightActive : #17C693 + HighlightButton : #00000080 + HighlightIcons : #00FFB5 + Scrollbar : #203F39 + ScrollbarThumb : #00FFB52A + Header : #00FFB52A + +[NonTextured] +(Text) + Text : #91E1CA + TextActive : #FFFFFF + TextButton : #0E4A39 + TextBorder : #91E1CA + TextBorderActive : #FFFFFF + TextBorderButton : #91E1CA + TextHighlight : #91E1CA + TextHighlightActive : #0E4A39 + TextHighlightButton : #A0FBE0 + TextWarning : #FFFC9B + TextError : #FF9494 + TextHeader : #A0FBE0 +(Other) + Frame : #1C1F21 : Border + Window : #263532 : Main + Details : #1C1F21 : Border + Cursor : #245F4E : Highlight + Selection : #245F4E80 + Curve : #245F4E : Highlight : 1.5 + CurveBackground : #1C1F21 : Border : 0.5 diff --git a/Themes/Palettes/Basic/Loch.unitypalette.meta b/Themes/Palettes/Basic/Loch.unitypalette.meta new file mode 100644 index 000000000..47b0e52d4 --- /dev/null +++ b/Themes/Palettes/Basic/Loch.unitypalette.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 601f548d8a0e2a14daba5890b1d9c24e +timeCreated: 1470326581 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file