Skip to content

Conversation

dumganhar
Copy link

No description provided.

@minggo minggo merged commit 31d26ac into cocos2d:v3.15.1 May 25, 2017
@minggo minggo added this to the 3.15.1 milestone May 25, 2017
minggo pushed a commit that referenced this pull request Jun 5, 2017
* remove APP_SHORT_COMMANDS setting (#17722) some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows. * Particle font size should be a const value (#17676) * Particle font size should be a const value * Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project. * JSB SocketIO.connect supports to pass a CA cert file (#17736) * JSB SocketIO.connect supports to pass a CA cert file * The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it. * The optimization for huawei. (#17832) * The optimization for huawei. * setAnimationInterval fix for all platforms. * disable debug * include fix. * Uses better configuration for huawei optimization (#17838) * Uses better configuration for huawei optimization * Updates jar file and uncomment fps controlling code * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840) * update release not and version (#17845) * [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861) * Updates jar to resolve warning while packaging APK file. (#17863) * update release date (#17870) * fix compiling error
dumganhar pushed a commit to dumganhar/cocos2d-x that referenced this pull request Jun 8, 2017
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Jun 16, 2017
* commit '5297248560f87719b87faf39d945cfda20ca5c1d': Updates jar to resolve warning while packaging APK file. (cocos2d#17863) [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (cocos2d#17861) update release not and version (cocos2d#17845)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants