10 Commits

Author	SHA1	Message	Date
kaile.yin	dd517813a8	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame	2014-10-25 23:02:38 +08:00
kaile.yin	e7de544231	1.fixed frame event may forword emit	2014-10-23 17:37:18 +08:00
minggo	47697daf03	remove unneeded codes	2014-10-21 17:28:14 +08:00
minggo	db8dc25b01	fix warning	2014-10-21 11:40:34 +08:00
youyou	03ebe0152b	fixed timeline loop	2014-10-19 21:32:23 +08:00
kaile.yin	5b0e2f0304	fixed emit last frame several times	2014-10-17 20:43:01 +08:00
Ricardo Quesada	3dda35b4ef	Adds `std::nothrow` to `new` ... Since cocos2d-x doesn't support exceptions, it is important to add `std::nothrow` to all the `new` statements	2014-08-27 16:31:57 -07:00
zhangcheng	8bf4c8b6c9	1. Fixes CCTimeLine warning. ... 2. Fixes CocoLoader warning. 3. Fixes TriggerTest Bug.	2014-07-15 18:07:33 +08:00
Dhilan007	6cff8cb564	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
2youyou2	5bce6b87ea	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00