Commit Graph

152 Commits

Author SHA1 Message Date
pandamicro 0ef4b39235 Fix compilation issue when COCOS_DEBUG = 2 2016-10-21 10:34:00 +08:00
pandamicro eedacaa57b Fix ScriptingCore::evalString 2016-10-20 11:35:14 +08:00
pandamicro 9b9845e02c Improve ScheduleWrapper function call 2016-10-19 16:27:08 +08:00
Wang Nan 9debe22d14 Merge pull request #348 from zilongshanren/fix-android-video-total-time
add ready to play event
2016-10-17 14:58:05 +08:00
zilongshanren be642ec1af add ready to play event 2016-10-17 11:59:38 +08:00
子龙山人 c4eb9c42ec Merge pull request #347 from zilongshanren/fix-android-video-total-time
Fix android video total time
2016-10-14 03:32:31 -07:00
zilongshanren 58be2ff238 add metaloaded and click event 2016-10-14 11:37:31 +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
natural-law f37c9bd0c7 Update the win32 project config. 2016-09-22 18:20:17 +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
zhangbin c981f0e488 Improve the implementation of dragonbones. 2016-09-22 17:37:35 +08:00
zhangbin eb4ce7d13a Solve the errors in jsbindings. 2016-09-21 15:23:35 +08:00
zhangbin 070bada185 Solve the errors in js bindings. 2016-09-19 17:44:12 +08:00
CocosRobot fc6e13b9a2 [ci skip][AUTO]: updating jsbinding automatically 2016-09-19 06:29:37 +00:00
zhangbin 119fec9efe Merge branch 'develop' into dragonbones
# Conflicts:
#	external/config.json
2016-09-13 16:29:59 +08:00
CocosRobot 4f8b0a560a [ci skip][AUTO]: updating jsbinding automatically 2016-09-12 01:17:15 +00:00
zhangbin bbae20da07 Add config for dragonbones jsbinding. 2016-09-09 16:02:33 +08:00
pandamicro 919fba57c2 Remove useless GLProgrameState.setUniformCallback polyfill 2016-09-08 09:45:22 +08:00
CocosRobot 4b4d93b034 [ci skip][AUTO]: updating jsbinding automatically 2016-09-07 11:00:37 +00:00
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
zilongshanren c50da0fca5 use v1.2 editbox implementation 2016-09-05 15:40:22 +08:00
zilongshanren 7140dbb006 add webview https support 2016-09-05 13:58:10 +08:00
pandamicro 473325bc1e Merge pull request #302 from pandamicro/develop
Fix mac simulator
2016-09-02 10:59:07 +08:00
pandamicro 651551055a Fix mac simulator 2016-09-02 10:57:21 +08:00
CocosRobot f664fe1047 [ci skip][AUTO]: updating jsbinding automatically 2016-09-01 10:48:09 +00:00
pandamicro 86ae89f85f Fix win32 compilation issues 2016-09-01 10:38:54 +08: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
pandamicro ba33766602 Upgrade scripting/js-bindings/script to v3.13 2016-08-25 17:25:51 +08:00
zilongshanren 860428af73 add android support 2016-08-16 16:38:26 +08:00
pandamicro b742058510 Fix all compilation and linking issues 2016-08-16 16:09:39 +08:00
zilongshanren c6ee3598d3 add android support 2016-08-16 12:01:23 +08:00
pandamicro 6713fd2d11 Fix js-bindings project compilation issues 2016-08-15 19:08:58 +08:00
CocosRobot 9da0205b30 [ci skip][AUTO]: updating jsbinding automatically 2016-08-14 17:25:41 +00:00
pandamicro f05b67e287 Upgrade cocos/scripting to v3.13 2016-08-09 18:17:42 +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
zilongshanren 2da7f90163 fix webview load https URL 2016-07-25 17:48:08 +08:00
zilongshanren b9533c134c change webview EventType type 2016-07-25 16:04:34 +08:00
Wang Nan b1845e70c3 Merge pull request #239 from knoxHuang/develop
add schedule jsb_binding  for #fireball/issues/3669
2016-07-21 12:23:11 +08:00
knoxHuang 8ff7482dfb add schedule jsb_binding for #fireball/issues/3669
1. pauseAllTargets
2. pauseAllTargetsWithMinPriority
3. resumeTargets
2016-07-20 20:39:07 +08:00
zilongshanren 862e868666 add return key event 2016-07-19 16:42:54 +08:00
Wang Nan e794a7ca6d Merge pull request #231 from cocos-creator/v1.1
merge V1.1
2016-07-18 18:22:35 +08:00
minggo 93d895a526 Merge pull request #228 from minggo/sync-15705
lock mutext to get element from g_queue
2016-07-18 18:05:01 +08:00
minggo 446e5f26b5 lock mutext to get element from g_queue 2016-07-18 18:04:35 +08:00