diff --git a/CHANGELOG.md b/CHANGELOG.md index ee0d46e..9e2bbcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,22 @@ 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-beta.2] - 2022-06-02 + +### Fixed + +* Fixed a bug that caused Multiply Color / Screen Color of different objects to be applied. + * See `CHANGELOG.md` in Core. + * No modifications to Samples and Framework. + + ## [4-r.5-beta.1] - 2022-05-19 ### Changed * Change iOS sample to work at 60FPS. -* Support multiply colors and screen colors added in Cubism 4.2. +* Support Multiply Color / Screen Color added in Cubism 4.2. * See Framework and Core. * Change to avoid features deprecated since API 30. * Update libraries used in Android samples. @@ -181,6 +191,7 @@ See [Core Changelog] for details. * What was `Package.json` is currently being changed to`cubism-info.yml`. +[4-r.5-beta.2]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.5-beta.1...4-r.5-beta.2 [4-r.5-beta.1]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.4...4-r.5-beta.1 [4-r.4]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.4-beta.1...4-r.4 [4-r.4-beta.1]: https://github.com/Live2D/CubismNativeSamples/compare/4-r.3...4-r.4-beta.1 diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md index a151171..bab67f4 100644 --- a/Core/CHANGELOG.md +++ b/Core/CHANGELOG.md @@ -5,11 +5,22 @@ 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/). +## 2022-06-02 + +### Changed + +* Upgrade Core version to 04.02.0001. + +### Fixed + +* Fixed a bug that caused Multiply Color / Screen Color of different objects to be applied. + + ## 2022-05-19 ### Added -* Support new Multiply Color & Screen Color features. +* Support new Multiply Color / Screen Color features. * Support new Blend Shape features. ### Changed diff --git a/Framework b/Framework index 9f31abd..15bb611 160000 --- a/Framework +++ b/Framework @@ -1 +1 @@ -Subproject commit 9f31abd2f4e48639049ef78bdbc2e19b3a13901d +Subproject commit 15bb611ed751e56f4bc10ed400c7adf7721289c1 diff --git a/Samples/Cocos2d-x/Demo/CMakeLists.txt b/Samples/Cocos2d-x/Demo/CMakeLists.txt index 2b08062..fe277fe 100644 --- a/Samples/Cocos2d-x/Demo/CMakeLists.txt +++ b/Samples/Cocos2d-x/Demo/CMakeLists.txt @@ -255,7 +255,7 @@ if(APPLE) set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon") set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") - set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "com.live2d.demo-4-r5-beta1-cocos2dx") + set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "com.live2d.demo-4-r5-beta1-1-cocos2dx") set_xcode_property(${APP_NAME} TARGETED_DEVICE_FAMILY "1,2") set_xcode_property(${APP_NAME} ONLY_ACTIVE_ARCH "NO") set_xcode_property(${APP_NAME} ARCHS "arm64")