Merge pull request #46 from Live2D/develop

Update to Cubism 4 SDK for Web R6
Live2D · Feb 21, 2023 · 5eb5a51 · 5eb5a51
2 parents ba0d4ed + 0219fa5
commit 5eb5a51
Show file tree

Hide file tree

Showing 13 changed files with 581 additions and 431 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,5 @@
 {
   "recommendations": [
-    "editorconfig.editorconfig",
-    "msjsdiag.debugger-for-chrome"
+    "editorconfig.editorconfig"
   ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [4-r.6] - 2023-02-21
+
+### Removed
+
+* Remove Debugger for Chrome from recommended extensions.
+  * Use `Javascript Debugger`, a built-in feature of Visual Studio Code.
+
+
 ## [4-r.5] - 2022-09-08
 
 ### Added
@@ -153,6 +161,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix issue with reloading model images in WebKit.
 
 
+[4-r.6]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5...4-r.6
 [4-r.5]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.5...4-r.5
 [4-r.5-beta.5]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.4...4-r.5-beta.5
 [4-r.5-beta.4]: https://github.com/Live2D/CubismWebSamples/compare/4-r.5-beta.3...4-r.5-beta.4

diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md
@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2023-02-21
+
+### Added
+
+* [Web] Added classes related to `Memory`.
+  * Add the funciton `initializeAmountOfMemory()` to adjust the amount of memory at initialization.
+
+
+## 2022-10-28
+
+### Fixed
+
+* [Java] Remove unnecessary methods.
+
+
+## 2022-10-06
+
+### Added
+
+* [Java] Add AAR file for Android.
+
 
 ## 2022-09-08
 

diff --git a/Framework b/Framework
diff --git a/LICENSE.md b/LICENSE.md
@@ -51,6 +51,7 @@ Live2D models listed below are available under Free Material License.
 ```
 Samples/Resources/Haru
 Samples/Resources/Hiyori
+Samples/Resources/Mao
 Samples/Resources/Mark
 Samples/Resources/Natori
 Samples/Resources/Rice

diff --git a/NOTICE.ja.md b/NOTICE.ja.md
@@ -17,6 +17,25 @@ Cubism 4 SDK for Web R1 にてそれ以前のベータ版から正式版のリ
 
 [Cubism SDK Manual]: https://docs.live2d.com/cubism-sdk-manual/warning-for-cubism4-web-r1-update/
 
+## [注意事項] 依存パッケージでの宣言重複エラーについて (2023-02-23)
+
+Cubism 4 SDK for Web Samples で利用されている依存パッケージのうち `@types/node` に起因する、
+宣言重複のエラーが発生する場合があります。
+
+こちらは以下のいずれかの手順で解決が可能であることを確認しております。
+
+### 解決策1: npm-check-updatesを利用する方法
+
+1. ターミナルで `/Samples/TypeScript/Demo` ディレクトリに移動する。
+1. コマンド `npm i -g npm-check-updates` を実行する。
+1. コマンド `ncu` を実行する。
+
+### 解決策2: @types/node明示的にインストールし直す方法
+
+1. ターミナルで `/Samples/TypeScript/Demo` ディレクトリに移動する。
+1. コマンド `npm uninstall @types/node` を実行する。
+1. コマンド `npm install @types/node` を実行する。
+
 ---
 
 ©Live2D
diff --git a/NOTICE.md b/NOTICE.md
@@ -14,6 +14,25 @@ Details on structural changes and how to update from projects prior to Cubism 4
 
 [Cubism SDK Manual]: https://docs.live2d.com/cubism-sdk-manual/warning-for-cubism4-web-r1-update/
 
+
+## [Caution] About the duplicate declaration error in dependent packages (2023-02-23)
+
+A duplicate declaration error may occur due to `@types/node` among the dependency packages used in the Cubism 4 SDK for Web Samples.
+
+We have confirmed that this can be resolved by one of the following procedures.
+
+### Solution 1: Use npm-check-updates
+
+1. Navigate to the `/Samples/TypeScript/Demo` directory in Terminal.
+1. Execute the command `npm i -g npm-check-updates`.
+1. Execute the command `ncu`.
+
+### Solution 2: Reinstall @types/node explicitly
+
+1. Navigate to the `/Samples/TypeScript/Demo` directory in Terminal.
+1. Execute the command `npm uninstall @types/node`.
+1. Execute the command `npm install @types/node`.
+
 ---
 
 ©Live2D
diff --git a/README.ja.md b/README.ja.md
@@ -84,29 +84,30 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま
 
 ### Node.js
 
-* 18.8.0
-* 16.17.0
-* 14.20.0
+* 19.6.0
+* 18.14.0
+* 16.19.0
+* 14.21.2
 
 
 ## 動作確認環境
 
 | プラットフォーム | ブラウザ | バージョン |
 | --- | --- | --- |
-| Android | Google Chrome | 104.0.5112.97 |
-| Android | Microsoft Edge | 104.0.1293.63 |
-| Android | Mozilla Firefox | 104.1.0 |
-| iOS / iPadOS | Google Chrome | 104.0.5112.99 |
-| iOS / iPadOS | Microsoft Edge | 104.0.1293.63 |
-| iOS / iPadOS | Mozilla Firefox | 104.0 |
-| iOS / iPadOS | Safari | 15.6.1 |
-| macOS | Google Chrome | 104.0.5112.101 |
-| macOS | Microsoft Edge | 104.0.1293.70 |
-| macOS | Mozilla Firefox | 104.0 |
-| macOS | Safari | 15.6.1 |
-| Windows | Google Chrome | 104.0.5112.102 |
-| Windows | Microsoft Edge | 104.0.1293.70 |
-| Windows | Mozilla Firefox | 104.0 |
+| Android | Google Chrome | 109.0.5414.117 |
+| Android | Microsoft Edge | 109.0.1518.80 |
+| Android | Mozilla Firefox | 109.2.0 |
+| iOS / iPadOS | Google Chrome | 110.0.5481.83 |
+| iOS / iPadOS | Microsoft Edge | 109.0.1518.80 |
+| iOS / iPadOS | Mozilla Firefox | 109.0 |
+| iOS / iPadOS | Safari | 16.3 |
+| macOS | Google Chrome | 110.0.5481.77 |
+| macOS | Microsoft Edge | 110.0.1587.41 |
+| macOS | Mozilla Firefox | 109.0.1 |
+| macOS | Safari | 16.3 |
+| Windows | Google Chrome | 110.0.5481.78 |
+| Windows | Microsoft Edge | 110.0.1587.41 |
+| Windows | Mozilla Firefox | 109.0.1 |
 
 Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。
 

diff --git a/README.md b/README.md
@@ -83,29 +83,30 @@ Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repositor
 
 ### Node.js
 
-* 18.8.0
-* 16.17.0
-* 14.20.0
+* 19.6.0
+* 18.14.0
+* 16.19.0
+* 14.21.2
 
 
 ## Operation environment
 
 | Platform | Browser | Version |
 | --- | --- | --- |
-| Android | Google Chrome | 104.0.5112.97 |
-| Android | Microsoft Edge | 104.0.1293.63 |
-| Android | Mozilla Firefox | 104.1.0 |
-| iOS / iPadOS | Google Chrome | 104.0.5112.99 |
-| iOS / iPadOS | Microsoft Edge | 104.0.1293.63 |
-| iOS / iPadOS | Mozilla Firefox | 104.0 |
-| iOS / iPadOS | Safari | 15.6.1 |
-| macOS | Google Chrome | 104.0.5112.101 |
-| macOS | Microsoft Edge | 104.0.1293.70 |
-| macOS | Mozilla Firefox | 104.0 |
-| macOS | Safari | 15.6.1 |
-| Windows | Google Chrome | 104.0.5112.102 |
-| Windows | Microsoft Edge | 104.0.1293.70 |
-| Windows | Mozilla Firefox | 104.0 |
+| Android | Google Chrome | 109.0.5414.117 |
+| Android | Microsoft Edge | 109.0.1518.80 |
+| Android | Mozilla Firefox | 109.2.0 |
+| iOS / iPadOS | Google Chrome | 110.0.5481.83 |
+| iOS / iPadOS | Microsoft Edge | 109.0.1518.80 |
+| iOS / iPadOS | Mozilla Firefox | 109.0 |
+| iOS / iPadOS | Safari | 16.3 |
+| macOS | Google Chrome | 110.0.5481.77 |
+| macOS | Microsoft Edge | 110.0.1587.41 |
+| macOS | Mozilla Firefox | 109.0.1 |
+| macOS | Safari | 16.3 |
+| Windows | Google Chrome | 110.0.5481.78 |
+| Windows | Microsoft Edge | 110.0.1587.41 |
+| Windows | Mozilla Firefox | 109.0.1 |
 
 Note: You can start the server for operation check by running the `serve` script of `./Samples/TypeScript/Demo/package.json`.