Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3 #20740

Open
wants to merge 338 commits into
base: v4
Choose a base branch
from
Open

V3 #20740

wants to merge 338 commits into from

Conversation

w815526955
Copy link

1

PatriceJiang and others added 30 commits December 21, 2018 09:20
sync branch 3.17.1 to v3 when 3.17.1 test pass
* Precompiled header

* Fix

* Precompiled header for cocos

* Precompiled header jscocos2d
It is necessary for flexible inheritance from the base class.
* Install ninja

* Fix android_cocos_new_test
* trigger compile

* update libs

* update 3rd party libs version
* Added functionality to clear pending responses and requests in the http client

* Responses and Requests now are processed in similar way

* Fix for clearing the http requests

* Added tests for HttpClient::clearResponseAndRequestQueue
* Implemented looping and disable user input for uiVideoPlayer

* Fixes on how to handle sub states

* Added UI Video Player Demo for Loop, style and user input enabled options
* support set ios deployment target for root project

* update gitignore
* refine cmake, add ios sign config

* switch the interface orientations order at info.plist
* refine cmake, support multi configuration when generate Xcode/VS

* docs update

* cmake, update multi config condition

* remove custom target property: CC_DEPEND_DLLS

* cmake, adapt res copy to multi config types

* move "APP_RES_DIR" up, and improve setup_cocos_app_config

* move repeat comments into docs

* notify user the copy file process

* target_link_options isn't supported until cmake 3.13

* cmake readme update
* Add Android P cutout area support
Related #19285

* coding style fix

* Update AppActivity.java

Fix android build

* suppress lint new api errors
* If path to file is tool long crash is possible.

If path to file is tool long crash is possible, because of chart buffer overflow.

* Incorrect replacement. Using iterator is better.

* Style fix

* Correct naming
minggo and others added 30 commits November 6, 2019 09:42
…atlas textures (#20300)

* Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA.
Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public.
Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA.
Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file.
Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving.

* [CCImage-ios.mm] Fixed indentation.

* [CCFontFNT.cpp/.h] Allow game to override FNT file parsing for extended formats.
[CCFontAtlas] Added flag to indicated if a texture is rotated in FontLetterDefinition.  This will allow for embedding a font atlas image inside a larger image atlas that supports rotation.
[CCLabel.cpp] Ensure that the rotated flag in the font letter definition is used when creating a sprite for the letter.

* [CCFontFNT.h] Fixed missing include statements.
* Recompile luajit

upgrade luajit in mac & ios

* target_link_options is not supported until 3.13

* update external

* update exteral, luajit -fPIC
* Screen Time would prevent UIApplicationDidBecomeActiveNotification and UIApplicationWillResignActiveNotification from being fired until reboot the iPad.

* code format fix
fixed broken links, removed outdated links.
* MINSIZEREL_RELWITHDEBINFO_Support

* Remove DEBUG_MODE

* Fix clang-tidy
* Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA.
Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public.
Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA.
Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file.
Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving.

* [CCImage-ios.mm] Fixed indentation.

* Added support for adding bitmap font atlas image sub-textures in a larger image atlas.  Also supports sub-texture rotation (90 degrees to the right, which is the default of the PLIST atlas format).

* [LabelTest.cpp] Updated BMFontOneAtlas test to support new BMFont label API

* [CCFontFNT.cpp] Added missing include statement.

* Updated LUA and JS bindings for the new BMFont code.
[CCLabelBMFont] This deprecated class required some modifications to work with the manual LUA bindings.

* [CCLabelBMFont] Reverted the API to the original interface since this class is deprecated.
Updated JS bindings.

* [LabelTest/LabelTest.cpp] Reverted usage of deprecated API.

* Re-added old API for creating bitmap font labels, but prefixed them as deprecated, in order to keep backwards compatibility.

* Fix for incorrect usage of variable that may be null.

* Added two new label tests for BM Font labels.  One tests a shared atlas with no rotated textures, and the other uses a PLIST atlas with rotated textures.  Added resources for these tests.

* Moved variable definitions outside of loop.
* fix infinite loop

* fix issue that touch event does not match
If click area ouside keyboard, then engine only receive touch begin event witouth touch end or touch cancled event.
… deallocated (#20285)

* In case of iOS 9.3.5 when we show a web view and deallocate the layer it is trying to release memory associated with WKWebView instance, but it hadn’t retained it in the first place. This results in a crash. This commit fixes that crash.

* Removing the autorelease and retain parts from the WKWebView instantiation.

* Changes so that we can remove the retain from the property declaration and depend only on manual retain and release of memory <Deep>
* close keyboard when Done is pressed
* Added tmx animated tile support, with test case. Tile animation are disabled by default, if user didn't enable it, the TMXTiledMap class will do just the same as this support not exists, no additional render resources needed. The tile animations are still rendered through SpriteBatchNode, no additional draw call needed.

* changed tileset tococos own's

* used cocos2dx own's tileset

* changed return type of TMXLayer::getAnimTileCoord to pointer for lua api converting

* deleted useless code, improved api

* re-generated script binding

* added CC_DLL to new classes, solved some problem posted on pull request

* changed return type of getTasks to pointer

* made TileAnimTask inherit form Ref

* removed a fixed FIXME

* added const to getTasks, deleted unneeded empty lines, re-generated script bindings

* deleted empty lines in TMXXMLParser
* Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA.
Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public.
Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA.
Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file.
Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving.

* [CCImage-ios.mm] Fixed indentation.

* [UILayout.cpp] Fix for incorrect SCISSOR clipping rectangle calculation.
[UILayoutTest.cpp] Test added to reproduce issue with SCISSOR clipping.

* Get reference to clipping rectangle instead of a copy.
[UIVideoViewWrapperIos clean] shouldn't reset _videoPlayer pointer,
since it is called in setUrl method and leaves instance in invalid
state. Subsequent calls to play, pause, etc. end up with crash.
* fix dpi

* merge catch cases

* add log when xdpi != ydpi
With latest ndk23 there is no move ANDROID define. 
The correct way (before and now) is to use __ANDROID__
https://iq.opengenus.org/detect-operating-system-in-c/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.