Commit Graph

5322 Commits

Author SHA1 Message Date
Masataka SUMI
c0d2ca06cf
Merge branch 'master' into disassemblyVrmShaders3 2024-07-23 19:55:14 +09:00
Masataka SUMI
b841f53623
Merge pull request #2366 from Santarh/disassemblyVrmShaders2
Move MToon10 material io definitions from VRMShaders to VRM10
2024-07-23 19:55:00 +09:00
Masataka SUMI
4291c38981
Merge branch 'master' into disassemblyVrmShaders2 2024-07-23 19:54:39 +09:00
Masataka SUMI
7e300661a8
Merge pull request #2365 from Santarh/disassemblyVrmShaders
Move VRM10 material format definitions from VRMShaders to VRM10
2024-07-23 19:52:20 +09:00
Masataka SUMI
57c8ae932b
Merge branch 'master' into disassemblyVrmShaders 2024-07-23 19:51:41 +09:00
ousttrue
dd50635bed
Merge pull request #2375 from ousttrue/fix/workaround_urp_editor_import
URP プロジェクトで matcap を含むモデルを Editor import するとエラーになるのを回避(暫定)
2024-07-23 15:41:10 +09:00
ousttrue
0f704c7142 URP プロジェクトで matcap を含むモデルを Editor import するとエラーになるのを回避(暫定)
とりえあずエラー回避。
`Exception: UnityEngine.Texture.Sphere is not converted`
mtoon URP "MToon" shader is not ready. import fallback to unlit
2024-07-23 15:34:10 +09:00
ousttrue
4b8d2f3f3b
Merge pull request #2374 from ousttrue/version/v0_124_2
UniVRM-0.124.2
2024-07-23 12:52:31 +09:00
ousttrue
2f38b0a902 UniVRM-0.124.2 2024-07-23 12:41:47 +09:00
Masataka SUMI
8a06ad1c0d
Merge branch 'master' into disassemblyVrmShaders3 2024-07-21 00:47:53 +09:00
Masataka SUMI
9ba33bb923
Merge branch 'master' into disassemblyVrmShaders2 2024-07-21 00:47:44 +09:00
Masataka SUMI
bc22a84527
Merge branch 'master' into disassemblyVrmShaders 2024-07-21 00:47:33 +09:00
ousttrue
4c79c6a4aa
Merge pull request #2371 from ousttrue/feature/springbone_add_joints
root の子孫に再帰的に joint を設定するボタン
2024-07-19 17:58:14 +09:00
ousttrue
deff52b7a7 root の子孫に再帰的に joint を設定するボタン 2024-07-19 17:29:54 +09:00
Masataka SUMI
f8fff30995 Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders3 2024-07-19 13:25:43 +09:00
Masataka SUMI
4e0356929b Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders2 2024-07-19 13:25:31 +09:00
Masataka SUMI
0c48ec5eab Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders 2024-07-19 13:24:38 +09:00
Masataka SUMI
35f900793d
Merge pull request #2364 from Santarh/mtoonSubmoduleDeinit
Replace MToon submodule with copying
2024-07-19 13:23:01 +09:00
Masataka SUMI
a5f75194c0 mv VRM0.X material io files from VRMShaders.VRM.IO.Runtime to VRM 2024-07-18 23:51:13 +09:00
Masataka SUMI
8a7d0a82f3 mv namespace from VRMShaders.VRM10.MToon10 to VRM10.MToon10 2024-07-18 23:24:50 +09:00
Masataka SUMI
7449207ae8 remove prefix "VRMShaders.*" from MToon10 asmdef files. 2024-07-18 22:58:20 +09:00
Masataka SUMI
5d8134bf87 mv MToon10 from VRMShaders to VRM10 2024-07-18 22:55:02 +09:00
Masataka SUMI
36dd65c57b mv generated Vrm10Material format from VRMShaders.VRM10.Format.Runtime to VRM10 2024-07-18 22:44:05 +09:00
Masataka SUMI
f0947fb91c Restore .gitignore 2024-07-18 22:15:01 +09:00
Masataka SUMI
12ef83638f Add MToon v3.9 2024-07-18 22:13:01 +09:00
Masataka SUMI
5d8d3175d1 remove mtoon submodule 2024-07-18 22:11:29 +09:00
ousttrue
4e7bd4b4af
Merge pull request #2363 from ousttrue/feature/springbone_pause
add BlittableExternalData.Paused
2024-07-18 18:47:43 +09:00
ousttrue
4dc5aae73c AddLogic to LogicFromTransform 2024-07-18 18:46:26 +09:00
ousttrue
1d2fed7e18 remove unsafe 2024-07-18 18:46:26 +09:00
ousttrue
02db0d3ba0 setter 2024-07-18 18:46:25 +09:00
ousttrue
7f089f1dd8 FastSpringBoneBufferBuilder を FastSpringBoneBuffer.FastSpringBoneBuffer に合体 2024-07-18 18:46:25 +09:00
ousttrue
80c2bb921c TransformIndexMap to Array.IndexOf 2024-07-18 18:46:25 +09:00
ousttrue
3d00753c83 remove simulateLastBone 2024-07-18 18:46:25 +09:00
ousttrue
d8735d8952 internal Vrm10RuntimeSpringBone.Vrm10RuntimeSpringBone 2024-07-18 18:46:25 +09:00
ousttrue
a9d645d4ff impl Vrm10RuntimeSpringBone.RestoreInitialTransform 2024-07-18 18:46:25 +09:00
ousttrue
b69b3760e3 private FastSpringBoneBufferBuilder m_initialData 2024-07-18 18:46:25 +09:00
ousttrue
7f856bf945 separate FastSpringBoneBufferBuilder 2024-07-18 18:46:25 +09:00
ousttrue
3a37f35883 Vrm10Runtime から SpringBone 関連を Vrm10RuntimeSpringBone に分離 2024-07-18 18:46:25 +09:00
ousttrue
5b47fab89f SpringBonePaused to IsSpringBoneEnabled. invert boolean 2024-07-18 18:46:25 +09:00
ousttrue
af9e18c09c add BlittableExternalData.Paused 2024-07-18 18:46:25 +09:00
ousttrue
c39e5e7d90
Merge pull request #2362 from ousttrue/feature/univrm_logger
UniGLTFLogger を追加
2024-07-16 16:26:53 +09:00
ousttrue
2b4f4bc343 とりあえず ILogHandler に対応。更なる拡張は使うときに。 2024-07-16 16:18:26 +09:00
ousttrue
42a3014e7a UniGLTFLogger を追加
[System.Diagnostics.Conditional("VRM_DEVELOP")] により呼び出しが消滅する。
2024-07-16 15:48:50 +09:00
ousttrue
36f6eeb436
Merge pull request #2336 from ousttrue/fix/springbone_ui
[SpringBone] inspector改修
2024-07-11 19:43:43 +09:00
ousttrue
5269bb9b8a remove unused 2024-07-11 19:12:28 +09:00
ousttrue
2ff310a070 VRM10SpringBoneJoint.s_activeForGizmoDraw to InternalsVisibleTo
"DrawColliders"
2024-07-11 19:09:35 +09:00
ousttrue
5b954dbb7c add toggle DrawCollider 2024-07-11 18:20:32 +09:00
ousttrue
57af53c221 comment 2024-07-11 15:19:00 +09:00
ousttrue
7d3aa056ce collider のカスタムエディターで無効なパラメーターを表示しない 2024-07-11 15:11:34 +09:00
ousttrue
5500fd5051 fix plane offset. magenta 2024-07-11 14:12:07 +09:00