diff --git a/.idea/.idea.BABA_YAGA/.idea/workspace.xml b/.idea/.idea.BABA_YAGA/.idea/workspace.xml index 83f7091a..c11dfb91 100644 --- a/.idea/.idea.BABA_YAGA/.idea/workspace.xml +++ b/.idea/.idea.BABA_YAGA/.idea/workspace.xml @@ -6,14 +6,16 @@ - - - - - - - + + + + + + + + + diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat index 18742702..089eedc7 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Black.mat @@ -119,7 +119,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1} - - _Color: {r: 0.117646985, g: 0.117646985, b: 0.117646985, a: 1} + - _Color: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat index 70a55b1f..dfedcdc7 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Blue.mat @@ -120,7 +120,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1} - - _Color: {r: 0.18101203, g: 0.61652833, b: 0.7941176, a: 1} + - _Color: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1} - _EmissionColor: {r: 0.05693069, g: 0.1943069, b: 0.25, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat index 29bf5d3e..2e437c7b 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/BlueEmissive.mat @@ -133,7 +133,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1} - - _Color: {r: 0, g: 0.26590905, b: 0.5735295, a: 1} + - _Color: {r: 0, g: 0.26590908, b: 0.5735295, a: 1} - _EmissionColor: {r: 0.585611, g: 1.1171656, b: 1.7207954, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat index 42516647..951175dd 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Exterior/ExteriorDarkGrid.mat @@ -120,7 +120,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1} - - _Color: {r: 0.08490565, g: 0.08490565, b: 0.08490565, a: 1} + - _Color: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1} - _EmissionColor: {r: 0.63061863, g: 0.94044524, b: 1.6181911, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat index c15bddf1..4dacd917 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbInner.mat @@ -133,7 +133,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 1, b: 0.090196066, a: 0.36078432} - - _Color: {r: 0, g: 1, b: 0.09019602, a: 0.36078432} + - _Color: {r: 0, g: 1, b: 0.090196066, a: 0.36078432} - _EmissionColor: {r: 0, g: 1, b: 0.09019608, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat index 5acbff7b..73963e91 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/FastTimeOrbOuter.mat @@ -125,7 +125,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0, g: 1, b: 0.089654915, a: 0.359} - - _Color: {r: 0, g: 1, b: 0.089654885, a: 0.359} + - _Color: {r: 0, g: 1, b: 0.089654915, a: 0.359} - _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat index 4b4c9ee7..74e7357e 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbInner.mat @@ -133,7 +133,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432} - - _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.36078432} + - _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432} - _EmissionColor: {r: 1, g: 0.1764706, b: 0.1764706, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat index 80b3acab..aa94d333 100644 --- a/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat +++ b/Assets/Opsive/UltimateCharacterController/Demo/Materials/Scene/Props/SlowTimeOrbOuter.mat @@ -125,7 +125,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359} - - _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.359} + - _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359} - _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Third Parties/vFavorites/VFavorites.cs b/Assets/Third Parties/vFavorites/VFavorites.cs index c497a2f4..5b5e46b2 100644 --- a/Assets/Third Parties/vFavorites/VFavorites.cs +++ b/Assets/Third Parties/vFavorites/VFavorites.cs @@ -309,8 +309,7 @@ namespace VFavorites } void crossButton() { - if (!rowRect.IsHovered()) return; - if (draggingItem) return; + if (!rowRect.IsHovered()) return; if (draggingItem) return; // if (mousePresesdOnItem) return; // idk var buttonRect = rowRect.SetWidthFromRight(0).MoveX(-crossButtonOffsetFromRight).SetWidthFromMid(crossButtonSize); @@ -883,7 +882,8 @@ namespace VFavorites if (isWrappedBrowserLocked) - if (!totalRect_browserSpace.IsHovered() && !animatingDroppedItem && !animatingPageScroll) return; + if (EditorApplication.timeSinceStartup - lastLockToggleTime > 1) + if (!wrappedBrowser.position.SetPos(0, 0).IsHovered() && !animatingDroppedItem && !animatingPageScroll) return; wrappedBrowser.Repaint(); @@ -1845,6 +1845,11 @@ namespace VFavorites EditorPrefs.SetInt("vFavorites-lockedBrowserHash", lockedBrowser.GetHashCode()); EditorPrefs.SetInt("vFavorites-lockedBrowserDockAreaInstanceId", lockedBrowser.GetMemberValue("m_Parent").GetInstanceID()); + lastLockToggleTime = EditorApplication.timeSinceStartup; + + wrappedBrowser.Repaint(); + allBrowsers.ForEach(r => r.Repaint()); + curEvent.Use(); } @@ -1853,12 +1858,18 @@ namespace VFavorites if (!lockedBrowser) return; if (lockedBrowser.GetMemberValue("isLocked")) return; + var b = lockedBrowser; lockedBrowser = null; EditorPrefs.SetInt("vFavorites-lockedBrowserHash", 0); EditorPrefs.SetInt("vFavorites-lockedBrowserDockAreaInstanceId", 0); + lastLockToggleTime = EditorApplication.timeSinceStartup; + + if (b) b.Repaint(); + allBrowsers.ForEach(r => r.Repaint()); + curEvent.Use(); } @@ -1954,6 +1965,7 @@ namespace VFavorites static bool CanBrowserBeWrapped_byVTabs(EditorWindow browser) => !IsMarkedAsLocked(browser); + static double lastLockToggleTime; diff --git a/Assets/Third Parties/vTabs/VTabs.cs b/Assets/Third Parties/vTabs/VTabs.cs index 259d381f..a0beaf6b 100644 --- a/Assets/Third Parties/vTabs/VTabs.cs +++ b/Assets/Third Parties/vTabs/VTabs.cs @@ -927,11 +927,13 @@ namespace VTabs if (isWrapped) RestoreDefaultBrowserGUI(browser); + /* if (browser.GetPropertyValue("isLocked", exceptionIfNotFound: false)) { browser.SetPropertyValue("isLocked", false, exceptionIfNotFound: false); UpdateBrowserTitle(browser); } + */ return; } diff --git a/Packages/manifest.json b/Packages/manifest.json index d49bdcd0..4fe483e3 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -22,6 +22,7 @@ "com.unity.ugui": "2.0.0", "com.unity.visualeffectgraph": "17.3.0", "com.unity.visualscripting": "1.9.9", + "com.wooshii.foldericons": "https://github.com/WooshiiDev/Unity-Folder-Icons.git", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d3f4a492..5014c955 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -273,6 +273,13 @@ }, "url": "https://packages.unity.com" }, + "com.wooshii.foldericons": { + "version": "https://github.com/WooshiiDev/Unity-Folder-Icons.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "201a18f355d3e9bc49b337e7c93423743ab42b2f" + }, "com.unity.modules.accessibility": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6d89d60e..16215529 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -791,11 +791,11 @@ PlayerSettings: captureStartupLogs: {} activeInputHandler: 2 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: f26666dc-3d28-4cad-b5dd-83af9e105972 framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: HALLUCINATE + organizationId: scov3 cloudEnabled: 0 legacyClampBlendShapeWeights: 0 hmiLoadingImage: {fileID: 0}