Merge pull request #34 from Live2D/develop

Update to Cubism 4 SDK for Native R5_1
Live2D · Sep 15, 2022 · 0542d7a · 0542d7a
2 parents 8e94d81 + d600a6d
commit 0542d7a
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.5.1] - 2022-09-15
+
+* Fix a bug that caused a crash if an empty array existed in json.
+  * See `CHANGELOG.md` in Framework.
+
+
 ## [4-r.5] - 2022-09-08
 
 ### Added
@@ -246,6 +252,7 @@ See [Core Changelog] for details.
 * What was `Package.json` is currently being changed to`cubism-info.yml`.
 
 
+[4-r.5.1]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5...4-r.5.1
 [4-r.5]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.5...4-r.5
 [4-r.5-beta.5]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.4.1...4-r.5-beta.5
 [4-r.5-beta.4.1]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.4...4-r.5-beta.4.1

diff --git a/Framework b/Framework
diff --git a/Samples/Cocos2d-x/Demo/proj.android/gradlew b/Samples/Cocos2d-x/Demo/proj.android/gradlew
diff --git a/Samples/Cocos2d-x/Demo/proj.ios/scripts/proj_xcode b/Samples/Cocos2d-x/Demo/proj.ios/scripts/proj_xcode
diff --git a/Samples/Cocos2d-x/Demo/proj.linux/scripts/fix_libs b/Samples/Cocos2d-x/Demo/proj.linux/scripts/fix_libs
diff --git a/Samples/Cocos2d-x/Demo/proj.linux/scripts/make_gcc b/Samples/Cocos2d-x/Demo/proj.linux/scripts/make_gcc
diff --git a/Samples/Cocos2d-x/Demo/proj.mac/scripts/make_xcode b/Samples/Cocos2d-x/Demo/proj.mac/scripts/make_xcode
diff --git a/Samples/Cocos2d-x/Demo/proj.mac/scripts/proj_xcode b/Samples/Cocos2d-x/Demo/proj.mac/scripts/proj_xcode
diff --git a/Samples/Cocos2d-x/thirdParty/scripts/setup_cocos2d b/Samples/Cocos2d-x/thirdParty/scripts/setup_cocos2d
diff --git a/Samples/Metal/Demo/proj.ios.cmake/scripts/proj_xcode b/Samples/Metal/Demo/proj.ios.cmake/scripts/proj_xcode
diff --git a/Samples/OpenGL/Demo/proj.ios.cmake/scripts/proj_xcode b/Samples/OpenGL/Demo/proj.ios.cmake/scripts/proj_xcode
diff --git a/Samples/OpenGL/Demo/proj.linux.cmake/scripts/make_gcc b/Samples/OpenGL/Demo/proj.linux.cmake/scripts/make_gcc
diff --git a/Samples/OpenGL/Demo/proj.mac.cmake/scripts/make_xcode b/Samples/OpenGL/Demo/proj.mac.cmake/scripts/make_xcode
diff --git a/Samples/OpenGL/Demo/proj.mac.cmake/scripts/proj_xcode b/Samples/OpenGL/Demo/proj.mac.cmake/scripts/proj_xcode
diff --git a/Samples/OpenGL/thirdParty/scripts/setup_glew_glfw b/Samples/OpenGL/thirdParty/scripts/setup_glew_glfw
diff --git a/Samples/OpenGL/thirdParty/scripts/setup_ios_cmake b/Samples/OpenGL/thirdParty/scripts/setup_ios_cmake