axmol

Author	SHA1	Message	Date
Dhilan007	6cff8cb564	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
kaile.yin	d5a79f17ab	fixed set color to parent, it will effect its children	2014-07-08 10:13:15 +08:00
andyque	4e63a3da7d	modify nodeReader to support LabelAtlas and LabelBMFont	2014-07-01 10:11:36 +08:00
minggo	76e2540fd7	Merge pull request #7163 from darkdukey/fixNodeReader Fix NodeReader crash	2014-06-24 10:49:10 +08:00
minggo	fc7b42c0e5	Merge pull request #7157 from 2youyouo2/v3 update action timeline	2014-06-23 18:38:46 +08:00
andyque	d2680f2884	fix windows compile error	2014-06-23 18:29:23 +08:00
Nite Luo	21330860a9	Fix NodeReader will crash when encountered unknown NodeType	2014-06-20 17:24:34 -07:00
yinkaile	043c640037	fixed warning and logic error	2014-06-20 10:52:14 +08:00
2youyou2	0ce51162af	support Label widget	2014-06-19 14:11:37 +08:00
2youyou2	02363c2ae4	read visible property	2014-06-16 17:20:59 +08:00
2youyou2	f9a817a2bf	read flip property	2014-06-16 15:19:58 +08:00
2youyou2	7bb188f15a	fixed not read zorder	2014-06-16 15:03:53 +08:00
2youyou2	5bce6b87ea	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00
2youyou2	2031e0e92d	change TimelineAction to ActionTimeline	2014-06-13 16:03:03 +08:00