Commit Graph

15 Commits

Author SHA1 Message Date
James Chen 2e174ff1c2 Supports dispatching custom event for EventDispatcher. (#1240)
* Adds __jsbInvocationCount for SpiderMonkey.

* Supports dispatching custom event for EventDispatcher.
2018-05-14 17:19:03 +08:00
James Chen d92ab3cbe7 touch event should also pass pageX, pageY. jsb.loadImage supports data base64 string. (#1174)
* touch event should also pass pageX, pageY.

* jsb.loadImage supports data base64 string.
2018-03-30 07:41:59 +08:00
James Chen c3602eb1e3 [runtime] Android testcase works. (#1148)
* Adds jsb_run_script_module for CommonJS module, reverts original `require`.

* Uses window.gameTick for sending tick event.

* Removes unused scripts.

* Android testcase works.
2018-03-15 18:12:38 +08:00
James Chen 5fcd99a151 Fix compilation error after merging from upstream. 2018-03-12 16:05:11 +08:00
James Chen 26e8259389 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer 2018-03-12 15:34:45 +08:00
minggo 0d483a9b07 add back network (#1141)
* add back network

* add network back on windows
2018-03-09 16:20:48 +08:00
James Chen 15370e52db ios label works.TODO: outline, bold, underline. 2018-03-09 12:37:57 +08:00
James Chen 1cd2166684 continue. 2018-03-06 10:41:10 +08:00
James Chen 88123dbb7b Updates opengl binding and module fix. 2018-03-05 11:00:02 +08:00
James Chen d6a8e1ca34 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer
# Conflicts:
#	cocos/scripting/js-bindings/event/EventDispatcher.cpp
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
2018-03-02 11:07:11 +08:00
James Chen 235ad32f5e Updates opengl bindings 2018-03-02 11:02:13 +08:00
James Chen 8fe4aabe20 don't invoke tick now. 2018-03-01 17:20:16 +08:00
minggo cd0e15cd7f refactor android with new renderer (#1133) 2018-02-28 14:55:33 +08:00
James Chen f001d1135d Adds swapBuffer to GLView, bunny test works again on Mac. (#1129) 2018-02-24 14:22:06 +08:00
minggo 93090fea87 can run js on iOS and Mac (#1124) 2018-02-24 10:27:31 +08:00