Skip to content

Commit 9a7c710

Browse files
arimgerarimger
authored
Merge pull request #153 from arimger/develop
Develop - 0.14.4
2 parents 18ac973 + f2dff7c commit 9a7c710

8 files changed

Lines changed: 103 additions & 40 deletions

File tree

‎Assets/Editor Toolbox/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.14.4 [11.04.2026]
2+
3+
### Changed:
4+
- Package support for Unity 6.4+
5+
16
## 0.14.3 [29.12.2025]
27

38
### Added:

‎Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3+
// NOTE: Needed for EntityId
4+
#if UNITY_6000_4_OR_NEWER
5+
using UnityEngine;
6+
#endif
37

48
namespace Toolbox.Editor
59
{
@@ -8,17 +12,30 @@ namespace Toolbox.Editor
812

913
public static class ToolboxEditorHandler
1014
{
15+
#if UNITY_6000_4_OR_NEWER
16+
private static EntityId lastCachedEditorId;
17+
#else
1118
private static int lastCachedEditorId;
19+
#endif
1220
private static Editor lastCachedEditor;
1321
private static readonly Stack<Editor> cachedEditors = new Stack<Editor>();
1422

1523
private static void OnBeginEditor(Editor editor)
1624
{
25+
#if UNITY_6000_4_OR_NEWER
26+
var lastId = lastCachedEditor != null ? lastCachedEditor.GetEntityId() : default;
27+
#else
28+
var lastId = lastCachedEditor != null ? lastCachedEditor.GetInstanceID() : default;
29+
#endif
1730
//NOTE: it means that last Editor was null or disposed, anyway we probably want to reload drawers-related cache
18-
if (lastCachedEditor == null || lastCachedEditorId != lastCachedEditor.GetInstanceID())
31+
if (lastCachedEditor == null || lastCachedEditorId != lastId)
1932
{
2033
lastCachedEditor = editor;
34+
#if UNITY_6000_4_OR_NEWER
35+
lastCachedEditorId = editor.GetEntityId();
36+
#else
2137
lastCachedEditorId = editor.GetInstanceID();
38+
#endif
2239
OnEditorReload?.Invoke();
2340
}
2441

‎Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ internal enum LabelType
2626

2727
static ToolboxEditorHierarchy()
2828
{
29+
#if UNITY_6000_4_OR_NEWER
30+
EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= OnItemCallback;
31+
EditorApplication.hierarchyWindowItemByEntityIdOnGUI += OnItemCallback;
32+
#else
2933
EditorApplication.hierarchyWindowItemOnGUI -= OnItemCallback;
3034
EditorApplication.hierarchyWindowItemOnGUI += OnItemCallback;
35+
#endif
3136
}
3237

3338
/// <summary>
@@ -38,7 +43,11 @@ static ToolboxEditorHierarchy()
3843
/// <summary>
3944
/// Tries to display item label in the Hierarchy Window.
4045
/// </summary>
46+
#if UNITY_6000_4_OR_NEWER
47+
private static void OnItemCallback(EntityId instanceId, Rect rect)
48+
#else
4149
private static void OnItemCallback(int instanceId, Rect rect)
50+
#endif
4251
{
4352
if (!IsOverlayAllowed)
4453
{

‎Assets/Editor Toolbox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.browar.editor-toolbox",
33
"displayName": "Editor Toolbox",
4-
"version": "0.14.3",
4+
"version": "0.14.4",
55
"unity": "2018.1",
66
"description": "Tools, custom attributes, drawers, hierarchy overlay, and other extensions for the Unity Editor.",
77
"keywords": [

‎Packages/manifest.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.analytics": "3.6.12",
6-
"com.unity.collab-proxy": "2.0.0",
5+
"com.unity.ai.navigation": "1.1.6",
6+
"com.unity.analytics": "3.8.1",
7+
"com.unity.collab-proxy": "2.7.1",
78
"com.unity.editorcoroutines": "1.0.0",
8-
"com.unity.ide.rider": "3.0.18",
9-
"com.unity.ide.visualstudio": "2.0.17",
10-
"com.unity.test-framework": "1.1.31",
11-
"com.unity.textmeshpro": "3.0.6",
12-
"com.unity.timeline": "1.6.4",
13-
"com.unity.toolchain.win-x86_64-linux-x86_64": "1.0.0",
9+
"com.unity.ide.rider": "3.0.36",
10+
"com.unity.ide.visualstudio": "2.0.22",
11+
"com.unity.test-framework": "1.1.33",
12+
"com.unity.textmeshpro": "3.0.7",
13+
"com.unity.timeline": "1.7.7",
14+
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
1415
"com.unity.ugui": "1.0.0",
15-
"com.unity.xr.legacyinputhelpers": "2.1.10",
16+
"com.unity.xr.legacyinputhelpers": "2.1.12",
1617
"com.unity.modules.ai": "1.0.0",
1718
"com.unity.modules.androidjni": "1.0.0",
1819
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 58 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,32 @@
1010
"version": "1.0.0",
1111
"depth": 0,
1212
"source": "builtin",
13-
"dependencies": {}
13+
"dependencies": {
14+
"com.unity.modules.tilemap": "1.0.0",
15+
"com.unity.modules.uielements": "1.0.0"
16+
}
17+
},
18+
"com.unity.ai.navigation": {
19+
"version": "1.1.6",
20+
"depth": 0,
21+
"source": "registry",
22+
"dependencies": {
23+
"com.unity.modules.ai": "1.0.0"
24+
},
25+
"url": "https://packages.unity.com"
1426
},
1527
"com.unity.analytics": {
16-
"version": "3.6.12",
28+
"version": "3.8.1",
1729
"depth": 0,
1830
"source": "registry",
1931
"dependencies": {
20-
"com.unity.ugui": "1.0.0"
32+
"com.unity.ugui": "1.0.0",
33+
"com.unity.services.analytics": "1.0.4"
2134
},
2235
"url": "https://packages.unity.com"
2336
},
2437
"com.unity.collab-proxy": {
25-
"version": "2.0.0",
38+
"version": "2.7.1",
2639
"depth": 0,
2740
"source": "registry",
2841
"dependencies": {},
@@ -43,7 +56,7 @@
4356
"url": "https://packages.unity.com"
4457
},
4558
"com.unity.ide.rider": {
46-
"version": "3.0.18",
59+
"version": "3.0.36",
4760
"depth": 0,
4861
"source": "registry",
4962
"dependencies": {
@@ -52,32 +65,61 @@
5265
"url": "https://packages.unity.com"
5366
},
5467
"com.unity.ide.visualstudio": {
55-
"version": "2.0.17",
68+
"version": "2.0.22",
5669
"depth": 0,
5770
"source": "registry",
5871
"dependencies": {
5972
"com.unity.test-framework": "1.1.9"
6073
},
6174
"url": "https://packages.unity.com"
6275
},
76+
"com.unity.nuget.newtonsoft-json": {
77+
"version": "3.2.1",
78+
"depth": 3,
79+
"source": "registry",
80+
"dependencies": {},
81+
"url": "https://packages.unity.com"
82+
},
83+
"com.unity.services.analytics": {
84+
"version": "6.0.3",
85+
"depth": 1,
86+
"source": "registry",
87+
"dependencies": {
88+
"com.unity.ugui": "1.0.0",
89+
"com.unity.services.core": "1.12.4",
90+
"com.unity.modules.jsonserialize": "1.0.0"
91+
},
92+
"url": "https://packages.unity.com"
93+
},
94+
"com.unity.services.core": {
95+
"version": "1.14.0",
96+
"depth": 2,
97+
"source": "registry",
98+
"dependencies": {
99+
"com.unity.modules.androidjni": "1.0.0",
100+
"com.unity.nuget.newtonsoft-json": "3.2.1",
101+
"com.unity.modules.unitywebrequest": "1.0.0"
102+
},
103+
"url": "https://packages.unity.com"
104+
},
63105
"com.unity.sysroot": {
64-
"version": "1.0.0",
106+
"version": "2.0.5",
65107
"depth": 1,
66108
"source": "registry",
67109
"dependencies": {},
68110
"url": "https://packages.unity.com"
69111
},
70112
"com.unity.sysroot.linux-x86_64": {
71-
"version": "1.0.0",
113+
"version": "2.0.4",
72114
"depth": 1,
73115
"source": "registry",
74116
"dependencies": {
75-
"com.unity.sysroot": "1.0.0"
117+
"com.unity.sysroot": "2.0.5"
76118
},
77119
"url": "https://packages.unity.com"
78120
},
79121
"com.unity.test-framework": {
80-
"version": "1.1.31",
122+
"version": "1.1.33",
81123
"depth": 0,
82124
"source": "registry",
83125
"dependencies": {
@@ -88,7 +130,7 @@
88130
"url": "https://packages.unity.com"
89131
},
90132
"com.unity.textmeshpro": {
91-
"version": "3.0.6",
133+
"version": "3.0.7",
92134
"depth": 0,
93135
"source": "registry",
94136
"dependencies": {
@@ -97,7 +139,7 @@
97139
"url": "https://packages.unity.com"
98140
},
99141
"com.unity.timeline": {
100-
"version": "1.6.4",
142+
"version": "1.7.7",
101143
"depth": 0,
102144
"source": "registry",
103145
"dependencies": {
@@ -109,12 +151,12 @@
109151
"url": "https://packages.unity.com"
110152
},
111153
"com.unity.toolchain.win-x86_64-linux-x86_64": {
112-
"version": "1.0.0",
154+
"version": "2.0.4",
113155
"depth": 0,
114156
"source": "registry",
115157
"dependencies": {
116-
"com.unity.sysroot": "1.0.0",
117-
"com.unity.sysroot.linux-x86_64": "1.0.0"
158+
"com.unity.sysroot": "2.0.5",
159+
"com.unity.sysroot.linux-x86_64": "2.0.4"
118160
},
119161
"url": "https://packages.unity.com"
120162
},
@@ -128,7 +170,7 @@
128170
}
129171
},
130172
"com.unity.xr.legacyinputhelpers": {
131-
"version": "2.1.10",
173+
"version": "2.1.12",
132174
"depth": 0,
133175
"source": "registry",
134176
"dependencies": {
@@ -269,17 +311,6 @@
269311
"version": "1.0.0",
270312
"depth": 0,
271313
"source": "builtin",
272-
"dependencies": {
273-
"com.unity.modules.ui": "1.0.0",
274-
"com.unity.modules.imgui": "1.0.0",
275-
"com.unity.modules.jsonserialize": "1.0.0",
276-
"com.unity.modules.uielementsnative": "1.0.0"
277-
}
278-
},
279-
"com.unity.modules.uielementsnative": {
280-
"version": "1.0.0",
281-
"depth": 1,
282-
"source": "builtin",
283314
"dependencies": {
284315
"com.unity.modules.ui": "1.0.0",
285316
"com.unity.modules.imgui": "1.0.0",

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.19f1
2-
m_EditorVersionWithRevision: 2021.3.19f1 (c9714fde33b6)
1+
m_EditorVersion: 2022.3.62f2
2+
m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9)

‎ProjectSettings/boot.config‎

Whitespace-only changes.

0 commit comments

Comments
 (0)