yinkaile
|
5629e26e58
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into native-modules
# Conflicts:
# cocos/scripting/js-bindings/manual/jsb_creator_manual.cpp
|
2017-10-16 15:53:44 +08:00 |
|
James Chen
|
96709d7609
|
Fixes wrong usage of assert macro in jsb_creator_manual.cpp.
|
2017-10-13 17:45:08 +08:00 |
|
yinkaile
|
8ac7257a46
|
fixed merge errors
|
2017-10-12 18:15:21 +08:00 |
|
yinkaile
|
d38e168441
|
support native modules
|
2017-10-12 17:35:08 +08:00 |
|
Jare Guo
|
377881d4d3
|
update atlas getter
|
2017-10-12 10:05:46 +08:00 |
|
Jare Guo
|
63236f2cf9
|
support load spine atlas from preloaded texture on JSB
|
2017-10-11 01:10:03 +08:00 |
|
James Chen
|
df01303041
|
attachChild -> attachObject, detachChild -> detachObject, isSame -> strictEquals
|
2017-08-31 10:33:17 +08:00 |
|
James Chen
|
496d025e20
|
Removes unused code in jsb_creator_manual.cpp.
|
2017-08-30 14:17:11 +08:00 |
|
James Chen
|
24136c2133
|
Arguments root stuff fix.
|
2017-08-03 11:47:18 +08:00 |
|
James Chen
|
e5eac44c0f
|
cleanup
|
2017-08-02 14:41:10 +08:00 |
|
James Chen
|
854aa81c0d
|
JSB_PRECONDITION2->SE_PRECONDITION2
|
2017-07-31 10:57:59 +08:00 |
|
James Chen
|
2808497a88
|
clearException after manually registration.
|
2017-07-11 13:40:04 +08:00 |
|
James Chen
|
b8fe0d3674
|
Updates box2d bindings.
|
2017-07-07 15:16:27 +08:00 |
|