axmol

Author	SHA1	Message	Date
Liam	ed49250b9b	update for reader 1.update for sprite3d cullface 2.sync js code	2015-08-27 18:29:45 +08:00
Liam	c93d40869c	fix simulator crash when sprite3d resource is error	2015-07-29 16:52:40 +08:00
XiaoFeng	375e80bd70	Update 3d reader for compatible with cocosstudio 3.1.2 version csd file Update easing default speed	2015-06-23 11:31:16 +08:00
zhangcheng	1c983f1f39	GBKToUTF8	2015-06-17 13:16:06 +08:00
Vladimir Perminov	4c33050536	Optimize Vec2 small function Vec2 move to Vec2.inl Added: setZero(); Change all code: _vec2 = Vec2(x, y); -> _vec2.set(x, y); Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y); _vec2 += Vec2(x, y); -> _vec2.add(x, y); _vec2 = Vec2::ZERO; -> _vec2.setZero(); Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;	2015-04-19 20:40:52 +03:00
pipu	bb110449be	Reset method purge() definition for some Reader.	2015-03-31 14:56:24 +08:00
pipu	91acd6aea9	Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader.	2015-03-31 14:21:10 +08:00
pipu	6f20da4444	Add destroyCocosStudio()	2015-03-30 16:46:33 +08:00
Ray	2f4fbbf4e8	fix the define problem	2015-02-25 14:28:39 +08:00
Ray	94523b667a	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-02-25 14:19:37 +08:00
Ray	c66a4f28bc	Add CocosStudio UserCameraReader fix Sprite3DReader Test	2015-02-25 14:19:08 +08:00
Dale Stammen	b39b078593	fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms	2015-02-24 14:39:21 -08:00
Ray	35e3e8d62d	Sprite3D Reader and tests	2015-02-23 00:34:30 +08:00