Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,346 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

193 Commits

Author SHA1 Message Date
CocosRobot#Set 012e9982d8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-07-05 01:32:25 +00:00
CocosRobot 78d5a809c8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17933) 2017-06-20 09:01:57 +08:00
CocosRobot 12db177f5c [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17905) 2017-06-07 16:54:36 +08:00
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 dd880eedf7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17857) 2017-05-23 10:17:48 +08:00
CocosRobot a857ebe831 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17848) 2017-05-22 16:47:08 +08:00
CocosRobot 1bfbf35026 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17830) 2017-05-19 09:41:55 +08:00
CocosRobot ddb4dc893b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17733) 2017-04-21 09:16:25 +08:00
CocosRobot 87b4d7d54d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17507) 2017-03-15 16:23:50 +08:00
CocosRobot b32c84f8c2 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17449) 2017-03-06 18:28:58 +08:00
CocosRobot 7dbfc85a8f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17430) 2017-03-02 16:08:53 +08:00
CocosRobot#Set a3daaf3626 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-02-17 07:53:15 +00:00
CocosRobot ced1009291 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17339) 2017-02-10 14:14:16 +08:00
CocosRobot 85dbcc1638 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17332) 2017-02-09 17:07:42 +08:00
CocosRobot 3d51645d3d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17319) 2017-02-08 10:42:18 +08:00
CocosRobot c1b4358d13 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17290) 2017-02-06 16:31:09 +08:00
CocosRobot 4e6be0e9da [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17276) 2017-02-04 10:35:08 +08:00
CocosRobot#Set bdcf461dc3 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-23 01:32:57 +00:00
CocosRobot 21d57bfd39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17185) 2017-01-16 11:20:39 +08:00
CocosRobot f2114f36f8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17183) 2017-01-13 14:04:11 +08:00
CocosRobot 91ae4b1c03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17143) 2017-01-10 16:59:15 +08:00
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
CocosRobot edca6862b9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17009) 2016-12-14 09:37:46 +08:00
CocosRobot 77f5204877 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16972) 2016-12-09 14:30:01 +08:00
CocosRobot#Set 5ef072de03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-12-05 01:43:54 +00:00
CocosRobot 129838d960 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16896) 2016-11-24 11:39:02 +08:00
CocosRobot 18204c1e37 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16880) 2016-11-21 15:00:00 +08:00
CocosRobot d0705d9e25 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16828) 2016-11-09 17:33:47 +08:00
CocosRobot 2d18d703a0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16810) 2016-11-04 14:07:25 +08:00
CocosRobot 9eb177c6cc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16802) 2016-11-03 15:29:09 +08:00
CocosRobot#Set 57903077d0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-30 01:00:27 +00:00
CocosRobot 3ab1be61a7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16764) 2016-10-28 10:13:57 +08:00
CocosRobot 44f6865697 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16750) 2016-10-27 11:15:24 +08:00
CocosRobot 23ff5fc51f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16676) 2016-10-11 11:40:11 -07:00
CocosRobot 7410bdd981 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16563) 2016-09-12 10:03:21 +08:00
CocosRobot ced81f3527 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16554) 2016-09-12 09:46:19 +08:00
CocosRobot 8947ff722e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16514) 2016-09-05 13:48:58 +08:00
CocosRobot 6f4551cdad [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16513) 2016-09-05 10:19:41 +08:00
CocosRobot b6536e8d9f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16499) 2016-09-02 10:44:55 +08:00
CocosRobot ee4d59cf76 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16454) 2016-08-29 11:48:21 +08:00
CocosRobot d09ee83c5a [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16395) 2016-08-19 09:36:50 +08:00
CocosRobot 7540a64fd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16370) 2016-08-16 16:56:06 +08:00
CocosRobot 7f222c92e0 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16360) 2016-08-15 10:53:07 +08:00
CocosRobot aac49e35e1 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16284) 2016-07-31 22:50:28 +08:00
CocosRobot c5923e00ca [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16261) 2016-07-29 13:40:46 +08:00
CocosRobot af1783364b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-29 01:43:11 +00:00
CocosRobot 6b3454e9c6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-27 20:38:57 +00:00
CocosRobot e0abb981d5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-25 09:39:34 +00:00
CocosRobot 708dab448d [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16175) 2016-07-21 10:11:14 +08:00