Commit Graph

13 Commits

Author SHA1 Message Date
minggo 4ca29ac1cf Merge v3.15.1 (#17897)
* 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
2017-06-05 13:37:50 +08:00
CocosRobot 4ccc6ce5de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:53:45 +00:00
CocosRobot ae860bd6ee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 08:29:03 +00:00
CocosRobot 5e273da0ec [AUTO]: updating luabinding automatically 2015-01-21 09:33:26 +00:00
CocosRobot 7192681618 [AUTO]: updating luabinding automatically 2014-09-25 06:50:06 +00:00
CocosRobot dc15287ac3 [AUTO]: updating luabinding automatically 2014-09-02 05:45:07 +00:00
CocosRobot cdc41711f6 [AUTO]: updating luabinding automatically 2014-08-29 10:38:25 +00:00
CocosRobot 3b3747d518 [AUTO]: updating luabinding automatically 2014-08-29 08:12:40 +00:00
CocosRobot 8ea5083e32 [AUTO]: updating luabinding automatically 2014-07-17 14:20:04 +00:00
CocosRobot 2821a23640 [AUTO]: updating luabinding automatically 2014-07-02 02:15:26 +00:00
CocosRobot 3bd000b236 [AUTO]: updating luabinding automatically 2014-03-21 08:38:19 +00:00
CocosRobot fc5a34e500 [AUTO]: updating luabinding automatically 2014-03-18 07:55:30 +00:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00