axmol

Commit Graph

Author	SHA1	Message	Date
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	80de57be39	1、 fixes lua TriggerTest bug.	2014-07-16 14:50:35 +08:00
Dhilan007	6cff8cb564	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
zhangcheng	9204ac28df	1. merge v3	2014-07-02 15:37:15 +08:00
zhangcheng	cf9b049926	1. fixes same name warning.	2014-07-02 10:53:35 +08:00
zhangcheng	4b8f818a1d	1、Update binary parse lib.	2014-07-01 16:31:17 +08:00
zhangcheng	644b61e261	1. add SceneBinary to 2.x	2014-06-25 11:58:36 +08:00
James Chen	176a9b5fe6	Some warning fixes in TriggerMng.cpp and TriggerObj.cpp	2014-03-12 14:07:34 +08:00
chengstory	59aa17ea05	Change && to \|\| in conditions judge.	2014-03-11 22:02:55 +08:00
CaiWenzhi	5108d276b6	Modify trigger	2014-03-04 23:55:36 +08:00
James Chen	c6e7093270	closed #3833 : SceneTest of CocoStudio crashes	2014-01-24 11:50:58 +08:00
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

18 Commits