Skip to content

changed VRC Expression Menu UI to use Reorderable List #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TayouVR wants to merge 15 commits into from
Closed

changed VRC Expression Menu UI to use Reorderable List #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2716de9
Update Listing for version 3.0.9
Jun 22, 2022
0e1c1f8
Updating List
github-actions[bot] Jun 22, 2022
384feb4
Merge pull request #15 from vrchat/3.0.9
momo-the-monster Jun 22, 2022
742b778
Merge pull request #16 from vrchat/3.0.9
momo-the-monster Jun 24, 2022
365442f
Publish version 3.1.0
TayouVR Dec 17, 2022
9437190
Publish version 3.1.1
TayouVR Dec 17, 2022
6d41827
Publish version 3.1.2
TayouVR Dec 17, 2022
a4d66bf
Publish version 3.1.4
TayouVR Dec 17, 2022
624d206
Publish version 3.1.5
TayouVR Dec 19, 2022
27382a2
Publish version 3.1.6
TayouVR Dec 19, 2022
6a524ae
Publish version 3.1.7
TayouVR Dec 19, 2022
696babf
Publish version 3.1.8
TayouVR Dec 19, 2022
e9ab41a
Publish version 3.1.9
TayouVR Dec 19, 2022
46c2dac
Publish version 3.1.10
TayouVR Dec 19, 2022
7f7107f
changed VRC Expression Menu UI to use Reorderable List
TayouVR Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Publish version 3.1.7
  • Loading branch information
@TayouVR
TayouVR committed Dec 19, 2022
commit 6a524aef4306333d6c40155cc208030e56e655b7
7 changes: 6 additions & 1 deletion packages/com.vrchat.avatars/Editor/VRCSDK/SDK3A/SDK3AImportFix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ static SDK3AImportFix()
}
else
{
#pragma warning disable 4014
ReloadSDK();
#pragma warning restore 4014
File.WriteAllText(canaryFilePath, avatarsReimportedKey);
}
}
Expand All @@ -36,7 +38,10 @@ static SDK3AImportFix()
[MenuItem("VRChat SDK/Samples/Avatar Dynamics Robot Avatar")]
private static void OpenAvatarsExampleScene()
{
EditorSceneManager.OpenScene(exampleScenePath);
if(EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
{
EditorSceneManager.OpenScene(exampleScenePath);
}
}

public static async Task ReloadSDK()
Expand Down
2 changes: 1 addition & 1 deletion packages/com.vrchat.avatars/Runtime/VRCSDK/Plugins/VRCSDK3A-Editor.dll
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion packages/com.vrchat.avatars/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.vrchat.avatars",
"displayName": "VRChat SDK - Avatars",
"version": "3.1.6",
"version": "3.1.7",
"unity": "2019.4",
"description": "Our powerful Avatars 3.0 System",
"vpmDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/com.vrchat.base/Editor/VRCSDK/Plugins/VRC.SDK3.Dynamics.Contact.Editor.dll
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion packages/com.vrchat.base/Editor/VRCSDK/Plugins/VRC.SDK3.Dynamics.PhysBone.Editor.dll
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions packages/com.vrchat.base/Runtime/VRCSDK/Plugins/VRCSDKBase-Editor.dll
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion packages/com.vrchat.base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.vrchat.base",
"displayName": "VRChat SDK - Base",
"version": "3.1.6",
"version": "3.1.7",
"unity": "2019.4",
"description": "Base for VRChat SDK",
"vrchatVersion": "2022.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/com.vrchat.worlds/Editor/VRCSDK/SDK3/Components3/VRCSceneDescriptorEditor3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public override void OnInspectorGUI()
sceneDescriptor.gameObject.AddComponent<VRC.Core.PipelineManager>();
}

if (sceneDescriptor.spawns.Length == 0)
if (sceneDescriptor.spawns == null || sceneDescriptor.spawns.Length == 0)
{
sceneDescriptor.spawns = new[] { sceneDescriptor.transform };
UnityEngine.Debug.LogWarning($"Scene Descriptor spawns were empty, adding a default Spawn.");
Expand Down
7 changes: 6 additions & 1 deletion packages/com.vrchat.worlds/Editor/VRCSDK/SDK3/SDK3ImportFix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ static SDK3ImportFix()
}
else
{
#pragma warning disable 4014
ReloadSDK();
#pragma warning restore 4014
File.WriteAllText(canaryFilePath, worldsReimportedKey);
}
}
Expand All @@ -36,7 +38,10 @@ static SDK3ImportFix()
[MenuItem("VRChat SDK/Samples/UdonExampleScene")]
private static void OpenSampleUdonExampleScene()
{
EditorSceneManager.OpenScene(exampleScenePath);
if(EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
{
EditorSceneManager.OpenScene(exampleScenePath);
}
}

public static async Task ReloadSDK()
Expand Down
2 changes: 1 addition & 1 deletion packages/com.vrchat.worlds/Runtime/VRCSDK/Plugins/VRCSDK3-Editor.dll
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion packages/com.vrchat.worlds/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.vrchat.worlds",
"displayName": "VRChat SDK - Worlds",
"version": "3.1.6",
"version": "3.1.7",
"unity": "2019.4",
"description": "Tools for creating interactive VRChat worlds using Udon",
"dependencies": {
Expand Down