Skip to content

Commit

Permalink
Merge pull request #802 from malaybaku/develop
Browse files Browse the repository at this point in the history
v2.0.6
  • Loading branch information
malaybaku committed Jul 4, 2022
2 parents c528cbc + 96df6de commit 4e69ff4
Show file tree
Hide file tree
Showing 38 changed files with 182 additions and 621 deletions.
2 changes: 1 addition & 1 deletion Batches/build_unity.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ REM example: `build_unity.cmd full dev`

REM use following instead, if editor is NOT from Hub
REM set UNITY_EXE="%ProgramFiles%\Unity\Editor\Unity.exe"
set UNITY_EXE="%ProgramFiles%\Unity\Hub\Editor\2021.3.1f1\Editor\Unity.exe"
set UNITY_EXE="%ProgramFiles%\Unity\Hub\Editor\2020.3.22f1\Editor\Unity.exe"

cd %~dp0

Expand Down
2 changes: 1 addition & 1 deletion Batches/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.0.5
v2.0.6
8 changes: 4 additions & 4 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)

v2.0.5
v2.0.6

* 作成: 獏星(ばくすたー)
* 2022/06/29
* 2022/07/04

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

Expand Down Expand Up @@ -51,11 +51,11 @@ Windows 10環境でお使いいただけます。

適当なフォルダに本レポジトリを配置します。配置先について、空白文字を含むようなフォルダパスは避けて下さい。

Unity 2021.3系でUnityプロジェクト(本レポジトリの`VMagicMirror`フォルダ)を開き、Visual Studio 2022でWPFプロジェクトを開きます。
Unity 2020.3系でUnityプロジェクト(本レポジトリの`VMagicMirror`フォルダ)を開き、Visual Studio 2022でWPFプロジェクトを開きます。

メンテナの開発環境は以下の通りです。

* Unity 2021.3.1f1
* Unity 2020.3.22f1 Personal
* Visual Studio Community 2022 (17.0.0)
* 「.NET Desktop」コンポーネントがインストール済みであること
* 「C++によるデスクトップ開発」コンポーネントがインストール済みであること
Expand Down
11 changes: 5 additions & 6 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)

v2.0.5
v2.0.6

* Author: Baxter
* 2022/Jun/29
* 2022/Jul/04

The VRM avatar application without any special device.

Expand Down Expand Up @@ -54,16 +54,15 @@ note: Contact in English or Japanese is very helpful for the author.

Put the repository on your local folder. folder path should not include space character.

Open Unity project with Unity 2021.3.x, and open WPF project with Visual Studio 2022.
Open Unity project with Unity 2020.3.x, and open WPF project with Visual Studio 2022.

Maintainer's environment is:
Maintainer's environment is as following.

* Unity 2021.3.1f1
* Unity 2020.3.8f1 Personal
* Visual Studio Community 2022 17.0.0
* Component ".NET Desktop Development" is required.
* Also Component "C++ Desktop Development" is required, for Unity Burst compiler.


### 4.2. Asset install

* [FinalIK](https://assetstore.unity.com/packages/tools/animation/final-ik-14290)
Expand Down
139 changes: 0 additions & 139 deletions VMagicMirror/Assets/Baku/VMagicMirror/Materials/DummyForShadow.mat

This file was deleted.

This file was deleted.

0 comments on commit 4e69ff4

Please sign in to comment.