Commit Graph

50 Commits

Author SHA1 Message Date
CocosRobot f78565cbf1 [ci skip][AUTO]: updating jsbinding automatically 2017-02-10 09:57:04 +00:00
CocosRobot 90e611f0d2 [AUTO][ci skip]: updating cocos2dx_files.json 2017-01-16 06:31:43 +00:00
CocosRobot 8d13229c7e [ci skip][AUTO]: updating jsbinding automatically 2017-01-13 06:20:54 +00:00
Wang Nan da44033c9c Merge pull request #481 from natural-law/dragonbones-binding
Solve the error bindings of display related interfaces in dragonBones::Slot.
2017-01-10 15:42:48 +08:00
zhangbin 49aa1ef894 Solve the error bindings of display related interface in dragonBones::Slot. 2017-01-10 15:19:47 +08:00
CocosRobot 988d00421d [ci skip][AUTO]: updating jsbinding automatically 2017-01-09 03:21:56 +00:00
zhangbin 34b5595d3a Update the Spine runtime to version 3.5.35. 2017-01-05 14:36:52 +08:00
zilongshanren 272167e744 fix editbox black screen issue 2016-12-30 14:51:20 +08:00
zhangbin c473adea7c Improve the usage of addEvent & removeEvent of CCArmatureDisplay. 2016-12-22 16:38:21 +08:00
Wang Nan 7e9973a8b5 Merge pull request #450 from natural-law/issue4891
Update the runtime version of DragonBones.
2016-12-22 14:14:27 +08:00
zilongshanren 83d61dcbf7 add bitmap font batch rendering 2016-12-21 16:51:04 +08:00
zhangbin 0b0bc1121c Update the runtime version of DragonBones. 2016-12-20 11:19:07 +08:00
CocosRobot 4ab7572d5f [ci skip][AUTO]: updating jsbinding automatically 2016-12-09 01:53:33 +00:00
CocosRobot 18a9a3c6eb [ci skip][AUTO]: updating jsbinding automatically 2016-11-16 03:47:03 +00:00
CocosRobot a7d4a50eed [ci skip][AUTO]: updating jsbinding automatically 2016-11-11 08:02:35 +00:00
zhangbin 11e86ac9c5 Solve the crash when initializing DragonBones component in code. 2016-11-10 15:51:10 +08:00
pandamicro ee8bb071c4 Manually bind EventDispatcher::addCustomEventListener to avoid memory issue 2016-11-02 18:14:52 +08:00
pandamicro 028d3c9f3c Manual bind EventListenerCustom::create to avoid memory issue 2016-11-02 12:10:17 +08:00
pandamicro f1b3a9e24a Update auto bindings manually 2016-11-01 22:08:29 +08:00
pandamicro 06a9b6a89e Travis failed, update bindings 2016-10-24 03:03:28 +08:00
zhangbin e769890ddc Add method insertChildBefore for Creator issue 4335. 2016-10-13 18:37:04 +08:00
zhangbin 1e8ea4ee58 Solve the error on platform win32. 2016-09-27 15:14:12 +08:00
zhangbin ab293df6bd Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into dragonbones
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
2016-09-22 17:42:48 +08:00
zhangbin cd19cef93a Update the jsbindings. 2016-09-22 17:39:08 +08:00
CocosRobot fc6e13b9a2 [ci skip][AUTO]: updating jsbinding automatically 2016-09-19 06:29:37 +00:00
CocosRobot 4f8b0a560a [ci skip][AUTO]: updating jsbinding automatically 2016-09-12 01:17:15 +00:00
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
CocosRobot f664fe1047 [ci skip][AUTO]: updating jsbinding automatically 2016-09-01 10:48:09 +00:00
CocosRobot de6dd6d450 [ci skip][AUTO]: updating jsbinding automatically 2016-08-29 09:10:20 +00:00
pandamicro f4e9b225db Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
2016-08-29 09:46:41 +08:00
CocosRobot 09e3a5ef3a [ci skip][AUTO]: updating jsbinding automatically 2016-08-26 12:26:50 +00:00
pandamicro 2763b53ac1 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java
2016-08-26 19:11:51 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
zilongshanren 860428af73 add android support 2016-08-16 16:38:26 +08:00
zilongshanren c6ee3598d3 add android support 2016-08-16 12:01:23 +08:00
CocosRobot 88fec60ea0 [ci skip][AUTO]: updating jsbinding automatically 2016-08-01 03:40:13 +00:00
CocosRobot 2679a2dd4e [ci skip][AUTO]: updating jsbinding automatically 2016-07-29 08:32:12 +00:00
Wang Nan e794a7ca6d Merge pull request #231 from cocos-creator/v1.1
merge V1.1
2016-07-18 18:22:35 +08:00
CocosRobot 75282cc28a [ci skip][AUTO]: updating jsbinding automatically 2016-07-18 02:28:39 +00:00
2youyouo2 c4fc8d0e84 add graphics 2016-06-30 14:56:31 +08:00
CocosRobot 1d6d76bb9b [ci skip][AUTO]: updating jsbinding automatically 2016-06-14 03:22:41 +00:00
CocosRobot dc3d4ce03b [ci skip][AUTO]: updating jsbinding automatically 2016-05-27 06:06:47 +00:00
CocosRobot e7ca10567b [ci skip][AUTO]: updating jsbinding automatically 2016-05-27 03:04:27 +00:00
CocosRobot 00ba43da72 [ci skip][AUTO]: updating jsbinding automatically 2016-05-18 06:36:03 +00:00
CocosRobot de5ec7e839 [ci skip][AUTO]: updating jsbinding automatically 2016-05-11 09:50:45 +00:00
zilongshanren adc2a7c8b7 update js bindings 2016-05-10 14:17:32 +08:00
Wenhai Lin a4bdfa270c Fixed warns in JS bindings 2016-04-22 11:31:32 +08:00
Wenhai Lin 7bf60cb53e Update JS bindings and support generate JS bindings by NDK r11+. 2016-04-19 14:36:00 +08:00
2youyouo2 87c8deaf2e add creator files 2016-04-13 15:36:07 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00