diff --git a/.gitignore b/.gitignore index bf7e7e748c..5a218b572b 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ Assets/StreamingAssets/crashlytics-build.properties Assets/Private/ Assets/Private.meta +# sphinx build +public + diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 65797f2f9a..f365fc4ebb 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -4,8 +4,8 @@ namespace UniGLTF public static partial class UniGLTFVersion { public const int MAJOR = 2; - public const int MINOR = 19; + public const int MINOR = 20; public const int PATCH = 0; - public const string VERSION = "2.19.0"; + public const string VERSION = "2.20.0"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index b35390e8ba..dde29a6174 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.83.0", + "version": "0.84.0", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2019.4", @@ -11,6 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.83.0" + "com.vrmc.vrmshaders": "0.84.0" } } \ No newline at end of file diff --git a/Assets/VRM/Editor/Format/VRMVersionMenu.cs b/Assets/VRM/Editor/Format/VRMVersionMenu.cs index e5d40b026a..f8933a5776 100644 --- a/Assets/VRM/Editor/Format/VRMVersionMenu.cs +++ b/Assets/VRM/Editor/Format/VRMVersionMenu.cs @@ -154,6 +154,11 @@ public UpmPackage(string path, string template) ""displayName"": ""VRM10Viewer"", ""description"": ""VRM10 runtime loader sample"", ""path"": ""Samples/VRM10Viewer"" + }}, + {{ + ""displayName"": ""VRM10FirstPersonSample"", + ""description"": ""First Person layer sample with multi camera"", + ""path"": ""Samples/VRM10FirstPersonSample"" }} ] }} diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index fc1ca83192..8d007bedd9 100644 --- a/Assets/VRM/Runtime/Format/VRMVersion.cs +++ b/Assets/VRM/Runtime/Format/VRMVersion.cs @@ -4,8 +4,8 @@ namespace VRM public static partial class VRMVersion { public const int MAJOR = 0; - public const int MINOR = 83; + public const int MINOR = 84; public const int PATCH = 0; - public const string VERSION = "0.83.0"; + public const string VERSION = "0.84.0"; } } diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index e7d656d28b..d97dcfae02 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.83.0", + "version": "0.84.0", "displayName": "VRM", "description": "VRM importer", "unity": "2019.4", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.83.0", - "com.vrmc.gltf": "0.83.0" + "com.vrmc.vrmshaders": "0.84.0", + "com.vrmc.gltf": "0.84.0" }, "samples": [ { diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index c328780f29..a1c17087ab 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.83.0", + "version": "0.84.0", "displayName": "VRM-1.0β", "description": "VRM-1.0β importer", "unity": "2019.4", @@ -14,14 +14,19 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.83.0", - "com.vrmc.gltf": "0.83.0" + "com.vrmc.vrmshaders": "0.84.0", + "com.vrmc.gltf": "0.84.0" }, "samples": [ { "displayName": "VRM10Viewer", "description": "VRM10 runtime loader sample", "path": "Samples/VRM10Viewer" + }, + { + "displayName": "VRM10FirstPersonSample", + "description": "First Person layer sample with multi camera", + "path": "Samples/VRM10FirstPersonSample" } ] } diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index 08df0c7a54..454c0ebfc0 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.83.0", + "version": "0.84.0", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2019.4",