15 Commits

Author	SHA1	Message	Date
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
James Chen	e3ed28a8fb	issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*.	2013-06-20 14:02:14 +08:00
James Chen	b55a0dee2b	issue #2129: using cocos2d::extension::armature namespace for Armature extension.	2013-06-20 13:48:43 +08:00
Ricardo Quesada	159ef1ec68	clone() doesn't use copy constructor ... ... and other bug fixes	2013-06-18 15:06:53 -07:00
James Chen	2c0cc603d1	Merge branch 'master' into develop ... Conflicts: extensions/cocos-ext.h	2013-06-18 10:46:25 +08:00
James Chen	ccb67cbcb4	Template fix for iOS Template.	2013-06-17 15:54:12 +08:00
minggo	a221f06592	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
yinkaile	d29931dc4f	1.add hd resource ... 2.remove zobie resource 3.support frame event	2013-06-08 22:08:22 +08:00
chengstory	c2e85c1ae4	1. adds support for iOS and Mac. ... 2. Modify position of some examples.	2013-06-08 17:11:11 +08:00
yinkaile	8ff088da53	Standardize code	2013-06-08 12:14:43 +08:00
yinkaile	cba46082ce	Standardize code	2013-06-08 11:48:45 +08:00
yinkaile	7c924c714f	Standardize code	2013-06-07 22:56:54 +08:00
yinkaile	2418afc96d	conform declare and initialize order	2013-06-07 16:13:08 +08:00
yinkaile	10ed7ebdf4	merge newest version	2013-06-06 16:22:58 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00