Commit Graph

44 Commits

Author SHA1 Message Date
2youyouo2 96201232b8 Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-11 11:19:22 +08:00
Wenhai Lin dd5b3674c6 stability improvements 2016-05-11 10:29:54 +08:00
zilongshanren adc2a7c8b7 update js bindings 2016-05-10 14:17:32 +08:00
zilongshanren c647536c0c Merge branch 'develop' into syncMasterBranch
# Conflicts:
#	gulpfile.js
#	package.json
2016-05-10 14:12:59 +08:00
2youyouo2 ecab936f2a fixed clog 2016-05-09 13:35:24 +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
Wenhai Lin d4481bfd5a Refine (#48) 2016-04-28 11:58:34 +08:00
yinkaile ac688a8b64 fixed jsb DrawNode (#46)
Fixed jsb DrawNode
2016-04-27 19:54:03 +08:00
Wenhai Lin cdbd28ce43 [JSB]Fixed crash when WebSocket is closed. 2016-04-27 13:54:25 +08:00
Wenhai Lin 94501cc8f1 Bug fix and stability improvements 2016-04-25 15:56:03 +08:00
Wenhai Lin 1c5f974d78 Fixed generate error code for constructor 2016-04-22 14:10:02 +08:00
Wenhai Lin a4bdfa270c Fixed warns in JS bindings 2016-04-22 11:31:32 +08:00
Wenhai Lin a50b000b17 Fixed memory leak and warns 2016-04-21 23:47:26 +08:00
Wenhai Lin 83fc6fd1a8 Bug fix:
1.Fixed crash in win for rich text
2.Fixed crash when custom SSL certificate is set on iOS
3.Fixed SocketIO crash on reconnect
4.Fixed ActionManager memory leak
5.Fixed crash in MenuItem::activate
6.Fixed crash on exit game
7.Fixed crash in TableView::updateCellAtIndex
8.Fixed crash in RichText on window
2016-04-21 15:19:47 +08:00
Wenhai Lin 7bf60cb53e Update JS bindings and support generate JS bindings by NDK r11+. 2016-04-19 14:36:00 +08:00
Wenhai Lin 822966e820 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into md 2016-04-19 10:05:02 +08:00
Wenhai Lin 2c3bfd1cef Fixed memory leak 2016-04-18 16:16:17 +08:00
Wenhai Lin 48dbfc4609 Fixed typo in UILayout using clipping rect x instead of y coordinate 2016-04-18 11:50:04 +08:00
Wenhai Lin efc97073e3 Fixed memory leak 2016-04-18 11:06:14 +08:00
2youyouo2 b2571ab431 register creator job 2016-04-15 11:15:55 +08:00
2youyouo2 389e91893b Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-04-15 10:33:12 +08:00
Wenhai Lin e572df8a55 Fixed memory leak 2016-04-14 23:41:46 +08:00
2youyou2 4cabfc4e45 update win32 project 2016-04-14 18:56:00 +08:00
2youyou2 836cc2608c Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x-lite into develop 2016-04-14 15:44:35 +08:00
2youyouo2 fb87e4f62a only load project-runtime.json on runtime platform 2016-04-14 15:42:05 +08:00
2youyou2 5f83d4a2e3 update win32 config 2016-04-14 11:46:16 +08:00
2youyouo2 fa4b9cae89 update creator js binding 2016-04-13 21:42:14 +08:00
2youyouo2 d1394f9600 fixed jsb.js 2016-04-13 15:41:12 +08:00
2youyouo2 5b93ed1521 update jsb debugger 2016-04-13 15:40:51 +08:00
2youyouo2 6d965cbef9 update templates 2016-04-13 15:39:33 +08:00
2youyouo2 529c5d8899 remove JS: prefix for jsb log 2016-04-13 15:37:19 +08:00
2youyouo2 cf79acff10 add js_module_register 2016-04-13 15:36:29 +08:00
2youyouo2 87c8deaf2e add creator files 2016-04-13 15:36:07 +08:00
Wenhai Lin 7399218a5e Close web socket on exit may cause crash. 2016-04-11 15:52:40 +08:00
Wenhai Lin 85860e43d2 Add ListView constants for JS bindings 2016-04-08 21:46:45 +08:00
Wenhai Lin 1b3eba757a Bug fix:
1.Fix cc.CallFunc callback parameter issue
2.Fix arrivalOrder property of Node
2016-04-08 15:21:31 +08:00
Wenhai Lin e4b8db424a Withespaces does matter. 2016-04-07 21:56:30 +08:00
Wenhai Lin 34939f30fd sync bug fix++ 2016-04-07 21:56:09 +08:00
Wenhai Lin de0fa699dc Make selectedSprite optional in JSB too 2016-04-07 17:20:09 +08:00
Wenhai Lin b3a6312d88 Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener 2016-04-07 16:22:53 +08:00
Wenhai Lin 0e7cb5da16 no more uthash 2016-04-07 11:33:04 +08:00
Wenhai Lin 134ea5f318 Refine the JS implementations of CocoStudio parser 2016-04-06 23:38:36 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00