22 Commits

Author	SHA1	Message	Date
mogemimi	c0f2194961	Fix some minor typos in local variable names	2016-06-29 11:04:11 +09:00
Xpol Wan	90456d29ba	Fixes 1605 include path in 541 files ... using the tools/coding-style/include-linter.py with -f options.	2016-03-20 21:53:44 +08:00
XiaoFeng	0a657cd219	Remove cocos2dx.h reference from all cocos studio related files	2016-03-16 14:02:08 +08:00
Wenhai Lin	4fa58602a8	Adds `std::nothrow` to the `new` statements	2015-12-16 14:02:55 +08:00
XiaoFeng	17a5d07183	Fix 3d particle can not show in simulator	2015-08-03 09:53:16 +08:00
Liam	51993d5733	update for reader	2015-07-06 16:14:41 +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
minggo	1f5e5b5058	Merge pull request #11536 from xiaofeng11/v3 ... Update Node3DReader compatibility	2015-04-22 10:25:49 +08:00
pipu	fcd48ce2c3	Reset method purge() definition.	2015-04-21 18:16:38 +08:00
pipu	04cde1c52c	Modify that serialize base attribute for Node3DReader.	2015-04-21 18:05:46 +08:00
Vladimir Perminov	6ef1e7e3d0	Optimize Vec3 use constructor default. ... Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;	2015-04-20 12:56:43 +03:00
pipu	388e4b3a93	Modify that parse position for Node3DReader.	2015-04-20 15:56:36 +08: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	73e40f1c4b	Node3DReader Test	2015-02-19 16:18:54 +08:00
Ray	2f01deee89	3D Editor Reader ... Node3DReader	2015-02-19 12:08:09 +08:00