Skip to content

Commit

Permalink
[General]
Browse files Browse the repository at this point in the history
-- Updated all meta/cs files to 5.5 as well as standardized files to unix newlines with no trailing whitespace.
-- FileManager. Now supports monitor bool for toggling directory modifyDate checks.

[ThemeSystem]
-- ShowWindow will now only update window position & minSize if values are not already set correctly.
-- Added option for "Edit Mode" to toggle whether or not the File Manager monitors for file changes.
-- LookDev elements are now skipped while rebuilding/clearing style containers to prevent related errors.
-- Manual refresh (Shift + F1) will now forcefully reparse/reload all theme assets.
-- Added alternative handling for textureFormat in importers as it was deprecated in Unity 5.5.

[Theme Assets]
-- Updated standard guiSkin and Simplicity to 5.5 values/styles.
-- Updated all meta/cs files to a standardized unix newline with no trailing whitespace.
-- Fixed several dynamic assets to recognize as proper RGBA24 rather than RGB24 (due to automation no longer being function in 5.5).
-- Tweaked XP Palette to have a proper details header color.

[Simplicity]
-- GUIContent. Added CollabButton iconset replacements.
-- GUISkin. Added style for new "ACButton" (Add Component) button.
-- GUISkin. Added style for new "IN GameObjectHeader" distinction.
-- GUISkin. Fixed style stretch issues for Add Component arrows.
-- GUISkin. Fixed toolbar margin/padding issues introduced by Unity 5.5.
-- GUISkin. Fixed prefab/foldout margin/padding issues introduced by Unity 5.5.
  • Loading branch information
JadenKorn committed Jan 9, 2017
1 parent 64b63aa commit 0c91f07
Show file tree
Hide file tree
Showing 74 changed files with 697 additions and 287 deletions.
Binary file modified Codebase/@Solutions~/5.4/UnityEditor.dll
Binary file not shown.
Binary file modified Codebase/@Solutions~/5.4/UnityEngine.dll
Binary file not shown.
Binary file added Codebase/@Solutions~/5.5/UnityEditor.dll
Binary file not shown.
Binary file added Codebase/@Solutions~/5.5/UnityEngine.dll
Binary file not shown.
62 changes: 36 additions & 26 deletions Codebase/@Solutions~/Compile Themes 4.7.2.bat
Original file line number Diff line number Diff line change
@@ -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
62 changes: 36 additions & 26 deletions Codebase/@Solutions~/Compile Themes 5.4.bat
Original file line number Diff line number Diff line change
@@ -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
37 changes: 37 additions & 0 deletions Codebase/@Solutions~/Compile Themes 5.5.bat
Original file line number Diff line number Diff line change
@@ -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
Binary file modified Codebase/@Solutions~/UnityEditor.dll
Binary file not shown.
Binary file modified Codebase/@Solutions~/UnityEngine.dll
Binary file not shown.
Loading

0 comments on commit 0c91f07

Please sign in to comment.