Skip to content

Commit

Permalink
Merge pull request #1071 from malaybaku/develop
Browse files Browse the repository at this point in the history
v3.9.0
  • Loading branch information
malaybaku authored Nov 30, 2024
2 parents 1c6ed8a + aa87e56 commit 109830c
Show file tree
Hide file tree
Showing 56 changed files with 3,823 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Batches/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.8.4
v3.9.0
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Logo: by [@otama_jacksy](https://twitter.com/otama_jacksy)

v3.8.4
v3.9.0

* 作成: 獏星(ばくすたー)
* 2024/10/31
* 2024/11/30

WindowsでVRMを表示し、追加のデバイスなしで動かせるアプリケーションです。

Expand Down Expand Up @@ -181,6 +181,8 @@ https://github.com/malaybaku/VMagicMirror/blob/master/WPF/VMagicMirrorConfig/VMa

https://malaybaku.github.io/VMagicMirror/credit_license

また、本レポジトリに含む画像の一部は [Otomanopee](https://github.com/Gutenberg-Labo/Otomanopee) フォントを使って作成しています。フォント自体を再配布するものではないため、あくまで補足情報として記載しています。


### 5.2. Creative Commons Licenseに基づくモデルについて

Expand All @@ -191,7 +193,6 @@ https://malaybaku.github.io/VMagicMirror/credit_license

VMagicMirrorでは元モデルに対し、他のデバイスとの一貫性を保つためにマテリアルを適用しているほか、カスタマイズのためにテクスチャを変更可能にしています。


## 6. ローカリゼーションについて

日本語、英語以外のローカリゼーションでのContributionに興味がある場合、[about_localization.md](./about_localization.md)を参照して下さい。
Expand Down
5 changes: 3 additions & 2 deletions README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

Logo: by [@otama_jacksy](https://twitter.com/otama_jacksy)

v3.8.4
v3.9.0

* Author: Baxter
* 2024/Oct/31
* 2024/Nov/30

The VRM avatar application without any special device.

Expand Down Expand Up @@ -183,6 +183,7 @@ This page is similar, but it also refers to the libraries which are used in past

https://malaybaku.github.io/VMagicMirror/credit_license

Note that some images are created with [Otomanopee](https://github.com/Gutenberg-Labo/Otomanopee) font. This is not license notice, since the font itself is not redistributed.

### 5.2. About Model data under Creative Commons Attribution

Expand Down
138 changes: 138 additions & 0 deletions VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/Devices/Devices.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6432728701393205835}
- {fileID: 543472868124188234}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1784795306958615815
Expand Down Expand Up @@ -64,6 +65,143 @@ MonoBehaviour:
type: 3}
particleStore: {fileID: 7147831937674852361, guid: 8e3719f1996497d4894dcdf2334d55c5,
type: 3}
mangaParticleView: {fileID: 3861429823443917275}
--- !u!1001 &5588302324258032548
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5933559195360744184}
m_Modifications:
- target: {fileID: 277784890188760130, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_Name
value: MangaParticleView
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: df66306fbe481f94894e4c0a9d7bdc4a, type: 3}
--- !u!224 &543472868124188234 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5334354237754775022, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
m_PrefabInstance: {fileID: 5588302324258032548}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3861429823443917275 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8654562425755570815, guid: df66306fbe481f94894e4c0a9d7bdc4a,
type: 3}
m_PrefabInstance: {fileID: 5588302324258032548}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 908196ba11638a34cbe72b084aa19466, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8037310001979521660
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 109830c

Please sign in to comment.