14 Commits

Author	SHA1	Message	Date
Huabing.Xu	ec5398e7c6	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h	2014-04-14 14:08:19 +08:00
James Chen	7c5b4be0b1	Warning fixes in ui, getZOrder -> getLocalZOrder	2014-04-11 18:06:53 +08:00
Huabing.Xu	231cdcb906	adjust comment message	2014-04-10 11:14:46 +08:00
Huabing.Xu	07ac817a7c	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-10 10:52:15 +08:00
James Chen	61134426a8	Some fixes detected by xcode analyze	2014-04-09 20:41:09 +08:00
Huabing.Xu	a269ac2864	remove kmMat4 interface in cocostudio and UI	2014-04-09 14:44:54 +08:00
Huabing.Xu	b9af100493	visit() using Matrix instead of kmMat4	2014-04-08 21:45:54 +08:00
Huabing.Xu	29c345bd02	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-04 18:45:21 +08:00
Huabing.Xu	960ac300d5	migrate cocostudio to director matrix stack	2014-04-03 14:55:55 +08:00
andyque	fe33588038	issue #4636. finish UILayout	2014-04-03 11:14:35 +08:00
CaiWenzhi	a05969c395	Move layout "exe" to cpp	2014-03-26 17:58:53 +08:00
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
CaiWenzhi	2dffcb9808	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00