Commit Graph

9 Commits

Author SHA1 Message Date
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
knoxHuang ffb2c9af14 Label.file change to .font 2016-04-20 18:08:16 +08:00
Johnny Wu e493f2047b upgrade editor-framework to v0.5.0 2016-04-07 16:56:39 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
pandamicro 408a7c37c4 Add guard for CC_JSB flag 2016-02-03 11:40:45 +08:00
pandamicro 206123e9c1 Adjust indent 2016-02-03 11:34:01 +08:00
pandamicro e5e8ade1bd Fix JSB issues 2016-02-03 11:17:38 +08:00
Jare Guo 182b5cb5a3 make CC_EDITOR available in preview mode 2016-01-31 01:00:20 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00