12 Commits

Author	SHA1	Message	Date
minggo	3679d66c8e	remove unneeded includes	2014-08-29 15:39:52 +08:00
zhangcheng	6cfc5b72dc	1. CocosStudio adapt to cocos2d-x v3.2.	2014-07-21 17:45:56 +08:00
zhangcheng	644b61e261	1. add SceneBinary to 2.x	2014-06-25 11:58:36 +08:00
James Chen	49223fe50c	Compilation error fixes for linux port (clang compiler).	2014-03-07 13:52:54 +08:00
CaiWenzhi	7a4ba91f29	Modify project file	2014-03-05 17:08:59 +08:00
CaiWenzhi	5108d276b6	Modify trigger	2014-03-04 23:55:36 +08:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
James Chen	1edf748dc3	[JSB] Adds trigger bindings for CocoStudio.	2013-12-30 20:57:46 +08:00
chengstory	041e78cb54	Fixes failed to build android.	2013-12-26 17:17:02 +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