7 Commits

Author	SHA1	Message	Date
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
James Chen	edb2ad0933	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding ... Conflicts: cocos/editor-support/cocostudio/TriggerMng.cpp	2013-12-30 21:06:57 +08:00
James Chen	1edf748dc3	[JSB] Adds trigger bindings for CocoStudio.	2013-12-30 20:57:46 +08:00
chengstory	0488aa6dcb	fixed #3474 ... 1. Modify CCLOG, Add classname. 2. change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack. 3. remove unused do while(0).	2013-12-30 15:26:51 +08:00
chengstory	8afdf88d25	Test triiger 3.0	2013-12-26 01:17:04 +08:00
yinkaile	5eb961b165	fixed warning	2013-12-25 19:46:09 +08:00
yinkaile	d72c9d94d7	upload trigger code.	2013-12-25 17:40:54 +08:00