18 Commits

Author	SHA1	Message	Date
Ricardo Quesada	3838268fd0	Merge branch 'develop' into newRenderer	2013-12-14 19:28:01 -08:00
Ricardo Quesada	29a15c885a	Merge branch 'develop' into newRenderer	2013-12-12 11:44:09 -08:00
minggo	16efe94946	fix compiling error after fixing conflicts	2013-12-12 14:48:27 +08:00
James Chen	cc567a3077	issue #2790: Vector::remove —> Vector::erase.	2013-12-11 18:08:06 +08:00
Ricardo Quesada	23222923bf	Migrated code to Matrix4	2013-12-10 11:07:15 -08:00
James Chen	499a0404d4	issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector.	2013-12-05 10:35:10 +08:00
James Chen	1d5984b29a	issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach	2013-12-04 16:01:02 +08:00
James Chen	d4d864216b	issue #2790: Deletes Vector::init, adds Vector::setCapacity.	2013-12-04 16:00:18 +08:00
James Chen	90062b656d	issue #2790: Node::_children is Vector<Node*> now.	2013-12-04 16:00:17 +08:00
yinkaile	f308f2f95a	fix CCArmature display wrong on mac version	2013-11-19 11:22:40 +08:00
2youyou2	12d6bc1722	1. change CCARRAY_FOREACH to range-based loop	2013-11-06 15:25:44 +08:00
2youyou2	16c23d0ad3	remove CC_PROPERTY and CC_SYNTHESIZE.	2013-11-05 19:53:38 +08:00
2youyou2	3eef64c3b8	1. Change NULL to null ... 2. Remove CocoStudio/Armature files	2013-11-05 15:32:13 +08:00
2youyou2	25196072f2	1. change color json format ... 2. fix tween easing 3. fix CCBone crate bug	2013-11-05 11:57:20 +08:00
2youyou2	a9054ba14a	1.add method to set collider filter	2013-11-01 14:36:44 +08:00
yinkaile	8fa8b9f844	update develop	2013-10-30 09:41:40 +08:00
yinkaile	2d3df69982	fix add display	2013-10-29 16:57:06 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00