Skip to content

Commit

Permalink
Merge pull request #28 from Live2D/develop
Browse files Browse the repository at this point in the history
Cubism 4 SDK for Native R5 beta2
  • Loading branch information
itoh-at-live2d-com authored Jun 2, 2022
2 parents c74e83d + c380f4d commit b3250d3
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 4 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
13 changes: 12 additions & 1 deletion Core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Framework
Submodule Framework updated 1 files
+12 −1 CHANGELOG.md
2 changes: 1 addition & 1 deletion Samples/Cocos2d-x/Demo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit b3250d3

Please sign in to comment.