pandamicro
|
f9057b3f32
|
Merge pull request #12284 from pandamicro/v3
Fix template android compilation issue on physics3d
|
2015-06-12 21:10:40 +08:00 |
pandamicro
|
e9d648f151
|
Fix physics 3d macro include issue
|
2015-06-12 15:41:46 +08:00 |
jianglong0156
|
c317eb428a
|
fix webview crash in android
|
2015-06-11 17:28:02 +08:00 |
pandamicro
|
e0eff26674
|
Fix component function execution issue in JSB
|
2015-06-05 00:03:21 +08:00 |
pandamicro
|
25e047eb41
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
|
2015-06-04 23:29:45 +08:00 |
pandamicro
|
af756c50dc
|
Merge pull request #12184 from pandamicro/v3
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 20:42:35 +08:00 |
pandamicro
|
e75dee6e7c
|
Remove C++ invocation functions of Component
|
2015-06-04 20:10:10 +08:00 |
pandamicro
|
2da754dcf2
|
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
Add onEnter and onExit of components to CCNode's onEnter and onExit function
|
2015-06-04 18:39:52 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
pandamicro
|
2c168130ed
|
Fix jsbinding calls for CCComponent
|
2015-06-04 15:59:05 +08:00 |
pandamicro
|
83f7f30c1c
|
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 15:03:20 +08:00 |
pandamicro
|
9c23126d9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 13:14:34 +08:00 |
pandamicro
|
4c6f67fd7e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
tools/bindings-generator
web
|
2015-06-02 10:12:22 +08:00 |
pandamicro
|
fdec552ed7
|
Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader
|
2015-06-02 10:08:13 +08:00 |
jianglong0156
|
722b6b1baf
|
add video player binding files
|
2015-05-29 11:39:47 +08:00 |
jianglong0156
|
7820610f13
|
Merge branch 'modifyTestResource' into jsWebviewTest
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
|
2015-05-26 17:49:17 +08:00 |
andyque
|
81d562803b
|
upgrade rapidjson to 1.0.2
|
2015-05-25 11:43:03 +08:00 |
joshuastray
|
1366f615dd
|
mac && ios works
|
2015-05-22 10:43:37 +08:00 |
joshuastray
|
342734e3b5
|
Merge remote-tracking branch 'upstream/v3' into physics
|
2015-05-21 21:15:42 +08:00 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
Dale Stammen
|
3523173594
|
removed CC_PLATFORM_WP8
|
2015-05-20 07:58:39 -07:00 |
minggo
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +08:00 |
pandamicro
|
2685df73f2
|
Fix spine crash issue
|
2015-05-14 10:40:37 +08:00 |
pandamicro
|
3190d0e5fb
|
Add localStorage.clear test case
|
2015-05-12 19:02:22 +08:00 |
pandamicro
|
c9ee849a2c
|
Add localStorage.clear in JSB
|
2015-05-12 18:02:14 +08:00 |
jianglong0156
|
80326aa40e
|
add webiew jsb code
|
2015-05-12 10:30:51 +08:00 |
joshuastray
|
234f4db8a0
|
add SpritePolygon binding && js tests
|
2015-05-11 17:04:23 +08:00 |
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |