5 Commits

Author	SHA1	Message	Date
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