James Chen
|
dbe9716536
|
Adds BaseJSAction
|
2017-08-16 15:41:27 +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 |
|
James Chen
|
e86ed76abf
|
jsb2.0 windows works on v8.
|
2017-08-09 18:06:33 +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
|
32f9c7dc1f
|
Remove debugger
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
31af3a1e4e
|
Remove useless module and made Android compilation pass
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
a9c5e50745
|
Remove simple audio engine
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
27536dad4c
|
Fix critical issues in bindings code
|
2017-06-30 18:02:01 +08:00 |
|
pandamicro
|
f72d66db24
|
Refactor JSFunctionWrapper & Use MutableHandleValue for conversion’s return value
Upgrade to Spidermonkey v52. pass 8
|
2017-06-30 18:01:58 +08:00 |
|
pandamicro
|
b3107dc1db
|
Update engine version for -x-lite
|
2017-06-26 12:38:52 +08:00 |
|
James Chen
|
af6aa8f45e
|
ios jsc, sm works.
|
2017-06-26 10:41:26 +08:00 |
|
James Chen
|
259bbbd6b2
|
updates.
|
2017-06-16 16:32:24 +08:00 |
|
James Chen
|
91359f1f75
|
first commit
|
2017-06-15 17:24:30 +08:00 |
|
knoxHuang
|
9aa16c1bfe
|
fix create renderTexture error for fireball/issues/5860
|
2017-06-07 09:52:09 +08:00 |
|
pandamicro
|
e37196f41d
|
Fix issues with AssetsManager new features
|
2017-05-04 23:32:08 +08:00 |
|
pandamicro
|
cea2e9a012
|
Add more progression info to EventAssetsManager
|
2017-04-25 14:45:03 +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
|
2fcd3cd67e
|
Remove native actionManager from jsb
|
2017-03-23 18:17:02 +08:00 |
|
pandamicro
|
201a2ba4e4
|
Compilation succeed after remove Action in native
|
2017-03-23 18:15:47 +08:00 |
|
Jare Guo
|
a9713955c7
|
define rotation property for dragonbone
|
2017-03-22 15:37:31 +08:00 |
|
pandamicro
|
9db16ae099
|
Fix jsb.loadRemoteImg crash issue
|
2017-03-15 17:12:20 +08:00 |
|
pandamicro
|
63b71c536a
|
Fix AssetsManager issue after failed on manifest downloading
|
2017-03-15 17:11:53 +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 |
|
zhangbin
|
06e4c3eedf
|
Solve the error when using DragonBones on native.
|
2017-03-02 17:11:31 +08:00 |
|
pandamicro
|
5ac97200b9
|
Merge pull request #545 from pandamicro/v1.4
Fix JSB memory leak and reduce overall memory usage
|
2017-02-26 23:04:27 +08:00 |
|
pandamicro
|
af7661c0ce
|
Remove useless jsb polyfills to reduce memory usage
|
2017-02-24 18:08:35 +08:00 |
|
zhangbin
|
d27bfa164e
|
Modify the callback argument of spine event listener.
Change the argument trackIndex to trackEntry.
|
2017-02-10 17:16:25 +08:00 |
|
zhangbin
|
d5e3930131
|
Solve the conflict with google-protobuf.
|
2017-02-07 18:15:31 +08:00 |
|
pandamicro
|
1ada1f3351
|
Small fixes
|
2017-01-22 18:59:49 +08: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 |
|
pandamicro
|
171ad4e21a
|
Add Manifest::Asset conversion
|
2017-01-09 15:48:30 +08:00 |
|
pandamicro
|
ed180996ac
|
Use JS Function bind to avoid memory tracking issues
|
2017-01-06 17:00:47 +08:00 |
|
pandamicro
|
f4e3341115
|
Sync js bindings code from cocos2d-x v3.14
|
2017-01-06 16:59:40 +08:00 |
|
zhangbin
|
34b5595d3a
|
Update the Spine runtime to version 3.5.35.
|
2017-01-05 14:36:52 +08:00 |
|
zhangbin
|
c473adea7c
|
Improve the usage of addEvent & removeEvent of CCArmatureDisplay.
|
2016-12-22 16:38:21 +08:00 |
|
Wang Nan
|
c3de6d4152
|
Merge pull request #448 from cocos-creator/v1.3
merge V1.3
|
2016-12-21 14:32:08 +08:00 |
|
pandamicro
|
a79014a51e
|
Fix cc.director._actionManager and cc.director._scheduler
|
2016-12-20 11:36:33 +08:00 |
|
Wang Nan
|
6a85ff24a1
|
Merge pull request #420 from cocos-creator/v1.3
merge V1.3
|
2016-11-29 10:10:54 +08:00 |
|
Jare Guo
|
341a2973c4
|
bind new language codes
|
2016-11-28 16:18:02 +08:00 |
|
Nan Wang
|
9a934c8b46
|
Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-11-07 15:21:33 +08:00 |
|
David DeSimone
|
ea0ed5adcf
|
Fixing improperly named variable in cc.LabelBMFont.
|
2016-10-31 19:42:07 -07:00 |
|
zilongshanren
|
be642ec1af
|
add ready to play event
|
2016-10-17 11:59:38 +08:00 |
|
zilongshanren
|
58be2ff238
|
add metaloaded and click event
|
2016-10-14 11:37:31 +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 |
|