Commit Graph

30 Commits

Author SHA1 Message Date
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