James Chen
7c4eeecdde
Removes the unneeded support for passing 'key' arguments to cc.Scheduer.schedule/unschedule. ( #1009 )
...
* Removes the unneeded support for passing 'key' arguments to cc.Scheduler.schedule/unschedule.
* cc.REPEAT_FOREVER isn't defined in lite and it isn't needed to hack cc.Scheduler.schedule in script either.
2017-11-23 13:47:15 +08:00
James Chen
69ee2e12bb
Reverts localStorage changes in PR #545 since any js value could be converted to string.
...
Keeps the behavior the same as web browser.
2017-11-17 13:57:30 +08:00
James Chen
f7bd0dd738
Updates version to 1.7.0
2017-10-11 22:09:52 +08:00
James Chen
a73bb35b2b
Uses push instead of concat.
2017-10-10 18:31:49 +08:00
James Chen
9fb3358463
Reverts ...args
2017-10-10 18:02:43 +08:00
James Chen
7653cb453f
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/Android.mk
# cocos/editor-support/creator/CCCameraNode.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h
# cocos/network/SocketIO.cpp
# cocos/network/WebSocket-libwebsockets.cpp
# cocos/renderer/CCTextureCache.cpp
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp
# cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h
# cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp
# cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp
# cocos/scripting/js-bindings/manual/js_bindings_config.h
# cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.h
# cocos/scripting/js-bindings/manual/js_module_register.cpp
# cocos/scripting/js-bindings/manual/js_module_register.h
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h
# cocos/scripting/js-bindings/manual/jsb_helper.h
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.h
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.h
# cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.h
# cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp
# cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h
# cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
# cocos/scripting/js-bindings/proj.android/Android.mk
# cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
# cocos/scripting/js-bindings/script/jsb_boot.js
# tools/bindings-generator
# tools/tojs/cocos2dx.ini
# tools/tojs/genbindings.py
2017-08-10 18:04:24 +08:00
pandamicro
f0a6acc6c5
Fix callFunc creation issue with primitive data parameter
2017-07-22 14:29:00 +08:00
pandamicro
856de64714
Avoid restart crash in spidermonkey
2017-07-11 18:33:39 +08:00
pandamicro
b3107dc1db
Update engine version for -x-lite
2017-06-26 12:38:52 +08:00
James Chen
259bbbd6b2
updates.
2017-06-16 16:32:24 +08:00
pandamicro
eb55b59f14
Fix crash caused by some action create functions not referencing sub action
2017-04-24 12:05:36 +08:00
pandamicro
7df074e172
Reverse pure JS Action, reuse JSB Action
2017-04-22 14:57:16 +08:00
Nan Wang
58ddc819a9
merge v1.4
2017-03-29 17:12:33 +08:00
pandamicro
201a2ba4e4
Compilation succeed after remove Action in native
2017-03-23 18:15:47 +08:00
pandamicro
32d6e03478
Remove all arguments usage in JSB
2017-03-10 16:57:04 +08:00
pandamicro
f53775013b
Remove duplicated implementation of setTimeout/setInterval
2017-03-06 16:07:24 +08:00
pandamicro
af7661c0ce
Remove useless jsb polyfills to reduce memory usage
2017-02-24 18:08:35 +08:00
zhangbin
d5e3930131
Solve the conflict with google-protobuf.
2017-02-07 18:15:31 +08:00
pandamicro
f4e3341115
Sync js bindings code from cocos2d-x v3.14
2017-01-06 16:59:40 +08:00
David DeSimone
ea0ed5adcf
Fixing improperly named variable in cc.LabelBMFont.
2016-10-31 19:42:07 -07:00
pandamicro
919fba57c2
Remove useless GLProgrameState.setUniformCallback polyfill
2016-09-08 09:45:22 +08:00
pandamicro
ba33766602
Upgrade scripting/js-bindings/script to v3.13
2016-08-25 17:25:51 +08:00
pandamicro
b742058510
Fix all compilation and linking issues
2016-08-16 16:09:39 +08:00
knoxHuang
cf885823b7
update cocos2d_specifics and jsb_cocos2d
2016-05-17 17:26:44 +08:00
zilongshanren
c647536c0c
Merge branch 'develop' into syncMasterBranch
...
# Conflicts:
# gulpfile.js
# package.json
2016-05-10 14:12:59 +08:00
Wenhai Lin
035e3677a8
1.Allow to use custom shader uniforms and attributes on drawNode
...
2.Remove duplicate definition of `cc.FontDefinition`
3.Warn if fontDef.charID exceeds 16bits
2016-05-03 15:49:17 +08:00
yinkaile
ac688a8b64
fixed jsb DrawNode ( #46 )
...
Fixed jsb DrawNode
2016-04-27 19:54:03 +08:00
Wenhai Lin
94501cc8f1
Bug fix and stability improvements
2016-04-25 15:56:03 +08:00
Wenhai Lin
a6dbf31dcf
cocos 2d lite version
2016-03-29 17:55:48 +08:00