8 Commits

Author	SHA1	Message	Date
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +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
James Chen	f4825ec94a	Bug fixes for cocostudio.	2013-12-27 20:54:05 +08:00
chengstory	faaf6d3f2b	fixed #3457 fixes some bug.	2013-12-27 17:21:13 +08:00
chengstory	8ae7ecff33	Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h	2013-12-26 12:55:52 +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