Commit Graph

14 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
2youyouo2 2b105d60b1 Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-09 13:53:39 +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
yinkaile ac688a8b64 fixed jsb DrawNode (#46)
Fixed jsb DrawNode
2016-04-27 19:54:03 +08:00
Wenhai Lin 94501cc8f1 Bug fix and stability improvements 2016-04-25 15:56:03 +08:00
2youyouo2 fb87e4f62a only load project-runtime.json on runtime platform 2016-04-14 15:42:05 +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
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 de0fa699dc Make selectedSprite optional in JSB too 2016-04-07 17:20:09 +08:00
Wenhai Lin 134ea5f318 Refine the JS implementations of CocoStudio parser 2016-04-06 23:38:36 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00